[Wikitty-commits] r1130 - in trunk/wikitty-publication: . src/main/java/org/nuiton/wikitty/publication src/main/java/org/nuiton/wikitty/publication/action src/main/java/org/nuiton/wikitty/publication/externalize src/main/java/org/nuiton/wikitty/publication/synchro

Author: tchemit Date: 2011-08-12 14:16:04 +0200 (Fri, 12 Aug 2011) New Revision: 1130 Url: http://nuiton.org/repositories/revision/wikitty/1130 Log: - reformat pom - fix some basic code conventions (remove redundant stuff, ...) Modified: trunk/wikitty-publication/ trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java Property changes on: trunk/wikitty-publication ___________________________________________________________________ Modified: svn:ignore - target *.iml *.ipr *.iws .classpath .project .settings + target *.iml *.ipr *.iws .classpath .project .settings PutObjectStoreDirHere ObjectStore Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/pom.xml 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,243 +1,253 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.2-SNAPSHOT</version> + </parent> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> - - <properties> - <i18n.bundleOutputName>wikitty-publication</i18n.bundleOutputName> - </properties> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <properties> + <i18n.bundleOutputName>wikitty-publication</i18n.bundleOutputName> + </properties> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - - </dependencies> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <name>Wikitty :: publication</name> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> - <packaging>war</packaging> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <build> + </dependencies> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR,en_GB</bundles> - </configuration> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> + <name>Wikitty :: publication</name> - - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> - <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> - <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> - + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>war</packaging> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory> + ${project.build.directory}/generated-sources/models + </directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + <configuration> + <bundles>fr_FR,en_GB</bundles> + </configuration> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sj> + <jsp>http://java.sun.com/JSP/Page</jsp> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <fullPackagePath> + org.nuiton.wikitty.publication.entities + </fullPackagePath> + <defaultPackage> + org.nuiton.wikitty.publication.entities + </defaultPackage> + <extractedPackages> + org.nuiton.wikitty.publication.entities + </extractedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </project> Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,16 +1,6 @@ package org.nuiton.wikitty.publication; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; @@ -36,8 +26,20 @@ import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.search.operators.RestrictionName; import org.nuiton.wikitty.search.operators.True; +import org.nuiton.wikitty.storage.WikittySearchEngineInMemory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * This service must be extends by wikitty service that are over file system * directly or this kind of storage for wikitty. @@ -53,7 +55,6 @@ final static Log log = LogFactory.getLog(AbstractWikittyFileService.class); public AbstractWikittyFileService() { - super(); } /** @@ -69,7 +70,7 @@ /** * Write by jcouteau, used to check if a wikitty check a restriction * - * @see org.nuiton.wikitty.storage.WikittySearchEngineInMemory#checkRestriction + * @see WikittySearchEngineInMemory#checkRestriction * * @param restriction * the restriction @@ -257,10 +258,10 @@ switch (nullRes.getName()) { case IS_NULL: - checked = (o == null); + checked = o == null; break; case IS_NOT_NULL: - checked = (o != null); + checked = o != null; break; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,10 +24,9 @@ public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, String pathToCodeMirrorModeDire) { - super(); this.servContext = servContext; this.pathToCodeMirorUi = pathToCodeMirorUi; - this.pathToCodeMirrorModeDir = pathToCodeMirorUi + pathToCodeMirrorModeDir = pathToCodeMirorUi + pathToCodeMirrorModeDire; // TODO mfortun-2011-05-30 maybe change this Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,6 +24,12 @@ */ package org.nuiton.wikitty.publication; +import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.ScriptEvaluator; + +import javax.script.ScriptEngineManager; import java.io.IOException; import java.io.InputStream; import java.util.LinkedList; @@ -31,13 +37,6 @@ import java.util.Map; import java.util.Properties; -import javax.script.ScriptEngineManager; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.bidimap.DualHashBidiMap; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.ScriptEvaluator; - /** * Class used to determine mimetype for an extension, used to determine type of * wikittypub (data or text) with the extension and the mime type @@ -79,7 +78,7 @@ public MimeTypePubHelper() { decorator = new UiCodeDecorator(); - this.compilable = new LinkedList<String>(); + compilable = new LinkedList<String>(); bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); compilable.add("text/java"); @@ -163,7 +162,7 @@ public boolean isPubTextMime(String mimeType) { // will check if there is an engine for the mimetype - boolean result = false; + boolean result; // check if mimetype startwith the PUbtext prefix result = mimeType.startsWith(PREFIX_MIME_PUB_TEXT); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -74,10 +74,8 @@ * @throws FileNotFoundException * if file not found */ - public PropertiesExtended(File origin) throws FileNotFoundException, - IOException { - super(); - this.load(origin); + public PropertiesExtended(File origin) throws IOException { + load(origin); } @@ -93,11 +91,14 @@ * @throws FileNotFoundException * if file not found */ - public void load(File file) throws FileNotFoundException, IOException { - this.origin = file; + public void load(File file) throws IOException { + origin = file; FileReader fr = new FileReader(origin); - this.load(fr); - fr.close(); + try { + load(fr); + } finally { + fr.close(); + } } /** @@ -112,9 +113,12 @@ */ public void store() throws IOException { FileWriter fs = new FileWriter(origin); - this.store(fs, ""); - fs.close(); - + try { + store(fs, ""); + } finally { + fs.close(); + } + } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -4,9 +4,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import org.apache.commons.lang.StringUtils; import org.nuiton.processor.Processor; @@ -14,7 +12,6 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilterIn; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,12 +1,12 @@ package org.nuiton.wikitty.publication; -import java.io.File; -import java.io.IOException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; + +import java.io.File; +import java.io.IOException; /** * * Class that containt utils method when handle wikitty store as file. @@ -59,8 +59,8 @@ * Creates all the file system require from a label path in the working * directory * - * @param label - * the path string + * @param homeFile + * @param label the path string * @return if all the path was created * @throws IOException */ Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,9 +1,5 @@ package org.nuiton.wikitty.publication; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -11,6 +7,11 @@ import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyConfigOption; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import static org.nuiton.i18n.I18n._; public class WikittyPublicationConfig { @@ -36,7 +37,7 @@ ApplicationConfig conf = new ApplicationConfig(Option.class, null, props, configFilename); try { - conf.parse(null); + conf.parse(); } catch (ArgumentsParserException e) { e.printStackTrace(); } @@ -81,7 +82,7 @@ synchronized (WikittyPublicationConfig.class) { if (!instanceMap.containsKey(context)) { instanceMap.put(context, - WikittyPublicationConfig.getConfig(context)); + getConfig(context)); } } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,9 +1,5 @@ package org.nuiton.wikitty.publication; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -19,6 +15,11 @@ import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + /** * class meant to handle multicontext for wikitty publication. If want to use * this, you must declare in your properties file the WIKITTY_FALLBACK_FILE_KEY @@ -50,13 +51,13 @@ public WikittyPublicationFallbackService(WikittyService serv, ApplicationConfig config) throws ArgumentsParserException { - this.mainService = serv; + mainService = serv; if(config != null){ boolean isOverriding = config.getOptionAsBoolean(WIKITTY_FALLBACK_OVERRIDE); String fileName = config.getOption(WIKITTY_FALLBACK_FILE_KEY); if (fileName!=null){ - ApplicationConfig confFallBack=null; + ApplicationConfig confFallBack; if (isOverriding){ confFallBack= new ApplicationConfig(null, null,config.getFlatOptions(), fileName); @@ -456,7 +457,7 @@ */ protected Criteria idNotInCriteriaConstructor(Criteria origin, List<String> toExclude) { - Criteria result = null; + Criteria result; Search search = Search.query(origin); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,13 +1,14 @@ package org.nuiton.wikitty.publication; -import java.io.Serializable; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.entities.WikittyUser; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.io.Serializable; +import java.util.Map; + public class WikittyPublicationSession implements Serializable { /** @@ -25,7 +26,7 @@ protected String securityToken = null; transient protected WikittyUser user; - transient protected WikittyPublicationProxy proxy = null; + transient protected WikittyPublicationProxy proxy; transient protected String context; public WikittyPublicationSession(String context) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,13 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,10 +9,10 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -27,7 +20,15 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.operators.Element; -import com.opensymphony.xwork2.ActionContext; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class PublicationActionEdit extends PublicationBaseAction { @@ -43,8 +44,8 @@ protected WikittyProxy proxy; - protected boolean isDelete = false; - protected boolean isStore = false; + protected boolean isDelete; + protected boolean isStore; protected String wikittyId = ""; protected String version = ""; @@ -68,7 +69,7 @@ proxy = getWikittyPublicationProxy(); Map<String, Object> param = ActionContext.getContext().getParameters(); - this.formatArgs(param); + formatArgs(param); @@ -93,7 +94,7 @@ // on nous demande supprimer le wikitty, on l'efface et on // affichera un wikitty vide - String id = this.wikittyId; + String id = wikittyId; proxy.delete(id); // apres un effacement on reprend l'edition d'un tout nouveau @@ -108,9 +109,7 @@ .get(ARGS_KEY).toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); // recherche du Wikitty a editer ou creation d'un nouveau si // necessaire Criteria criteria = searchCriteria(argsString); @@ -127,7 +126,7 @@ if (wikitty == null && wikittyId !=null) { // c'est un nouvel objet, il n'a pas encore ete sauve, mais on // veut le faire - String id = this.wikittyId; + String id = wikittyId; wikitty = new WikittyImpl(id); } @@ -269,7 +268,7 @@ } public void setFile(File upload) { - this.uploadedFile = upload; + uploadedFile = upload; } public String getFileContentType() { @@ -298,7 +297,7 @@ public String getPostUrl() { - return this.getArgument(ARGS_KEY, "") + ".action"; + return getArgument(ARGS_KEY, "") + ".action"; } protected Map<String, Object> formatArgs(Map<String, Object> args) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,15 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; @@ -30,8 +21,19 @@ import org.nuiton.wikitty.publication.externalize.AbstractDecoredClass; import org.nuiton.wikitty.publication.externalize.WikittyPublicationClassLoader; import org.nuiton.wikitty.search.Criteria; -import com.opensymphony.xwork2.ActionContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class PublicationActionEval extends PublicationBaseAction implements ServletResponseAware, ServletRequestAware, PublicationContext { @@ -49,12 +51,12 @@ @Override public void setServletResponse(HttpServletResponse arg0) { - this.response = arg0; + response = arg0; } @Override public void setServletRequest(HttpServletRequest arg0) { - this.request = arg0; + request = arg0; } @@ -220,7 +222,7 @@ } public void setMimeType(String mimeType) { - this.contentType = mimeType; + contentType = mimeType; } public HttpServletResponse getResponse() { @@ -276,9 +278,7 @@ .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); return argsString; } @@ -301,7 +301,7 @@ for (String argElm : ActionContext.getContext().getParameters() .keySet()) { - result.put(argElm, this.getArgument(argElm, "")); + result.put(argElm, getArgument(argElm, "")); } return result; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.publication.action; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; +import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -16,7 +12,12 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.Criteria; -import com.opensymphony.xwork2.ActionContext; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PublicationActionRaw extends PublicationBaseAction implements ServletResponseAware { @@ -42,9 +43,7 @@ .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); Criteria criteria = searchCriteria(argsString); @@ -85,7 +84,7 @@ @Override public void setServletResponse(HttpServletResponse arg0) { - this.response = arg0; + response = arg0; } public InputStream getInputStream() { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,8 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.util.ArrayList; -import java.util.List; - +import com.opensymphony.xwork2.ActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; @@ -10,8 +8,11 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import com.opensymphony.xwork2.ActionContext; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; @@ -116,9 +117,7 @@ String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); Criteria criteriaWikitty = searchCriteria(argsString); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.util.List; -import java.util.Map; +import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.entities.WikittyLabel; @@ -11,9 +10,11 @@ import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; -import com.opensymphony.xwork2.ActionContext; +import java.util.List; +import java.util.Map; + /** * Base action that wikitty publication will extend, needed to work within a * struts architecture. @@ -79,7 +80,7 @@ @Override public void setSession(Map<String, Object> sess) { - this.session = sess; + session = sess; } /** @@ -87,7 +88,7 @@ * nom du critere doit etre convenablement positionné avec la chaine qui a * permit la recherche * - * @param contextvar + * @param subContext * @return */ protected Criteria searchCriteria(List<String> subContext) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,15 +1,13 @@ package org.nuiton.wikitty.publication.action; -import java.util.List; -import java.util.Map; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; - /** * Interface for eval action. * @@ -18,44 +16,31 @@ */ public interface PublicationContext { - - /** - * set attributes: - * <li> req - * <li> wsContext - * <li> actionName - * <li> mandatoryArguments - * <li> arguments - * - * @param req - */ - + HttpServletRequest getRequest(); - public HttpServletRequest getRequest(); - - public HttpServletResponse getResponse(); + HttpServletResponse getResponse(); - public WikittyProxy getWikittyProxy(); + WikittyProxy getWikittyProxy(); /** * add context to the url and parameter if necessary * @param url * @return */ - public String makeUrl(String url); + String makeUrl(String url); - public WikittyService getWikittyService(); + WikittyService getWikittyService(); - public List<String> getMandatoryArguments(); + List<String> getMandatoryArguments(); - public String getArgument(String name, String defaultValue); + String getArgument(String name, String defaultValue); - public String getContentType(); + String getContentType(); - public void setContentType(String contentType); + void setContentType(String contentType); - public String toString(); + String toString(); - public abstract Map<String,String> getArguments(); + Map<String,String> getArguments(); } \ No newline at end of file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,27 +1,23 @@ package org.nuiton.wikitty.publication.externalize; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import java.io.File; import java.io.PrintWriter; - import java.net.URL; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.List; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; - /** * Class reuse from the isis fish project. * @@ -122,10 +118,13 @@ /** * Compile un fichier java. * + * @param classpath * @param src * les fichiers java source * @param dest * le repertoire destination + * @param out + * @return */ protected static int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { @@ -133,8 +132,7 @@ int result = -1000; try { - JavaCompiler compiler = javax.tools.ToolProvider - .getSystemJavaCompiler(); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); // Use system compiler // JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler @@ -202,7 +200,7 @@ if (log.isDebugEnabled()) { log.debug("Found manifest : " + url); } - if ((url != null) && url.getFile().startsWith("file:/")) { + if (url != null && url.getFile().startsWith("file:/")) { String jarName = url.getPath().substring(5, url.getPath().indexOf("!")); if (!result.contains(jarName)) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -391,9 +391,8 @@ List<String> newFiles, List<String> existingFiles, FileFilter excludeFilter, String renameFrom, String renameTo) throws IOException { - JarFile jar = null; + JarFile jar = new JarFile(jarFile); try { - jar = new JarFile(jarFile); boolean findExisting = targetDir != null && targetDir.exists(); boolean filter = findExisting && excludeFilter != null; boolean rename = renameFrom != null && renameTo != null; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -23,7 +23,7 @@ int off = 0; int len = b.length; - return super.defineClass(name, b, off, len); + return defineClass(name, b, off, len); } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -53,9 +53,8 @@ } public FileSystemWIkittyId(String fileName, String path) { - super(); - this.setFileName(fileName); - this.setPath(path); + setFileName(fileName); + setPath(path); } @Override @@ -63,8 +62,8 @@ final int prime = 31; int result = 1; result = prime * result - + ((fileName == null) ? 0 : fileName.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + + (fileName == null ? 0 : fileName.hashCode()); + result = prime * result + (path == null ? 0 : path.hashCode()); return result; } 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-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,21 +24,6 @@ */ package org.nuiton.wikitty.publication.synchro; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; @@ -71,6 +56,22 @@ import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + public class WikittyPublicationFileSystem extends AbstractWikittyFileService { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -161,20 +162,20 @@ public WikittyPublicationFileSystem(ApplicationConfig app) throws URISyntaxException, IOException { - this.mimeHelper = new MimeTypePubHelper(); + mimeHelper = new MimeTypePubHelper(); String url = app.getOption(WikittyConfigOption.WIKITTY_SERVER_URL .getKey()); URI uri = new URI(url); - this.homeFile = new File(uri.getPath()); + homeFile = new File(uri.getPath()); - if (homeFile == null || !homeFile.exists()) { + if (!homeFile.exists()) { File cur = FileUtil.getCurrentDirectory(); homeFile = new File(cur.getAbsolutePath()); } - this.label = uri.getFragment(); + label = uri.getFragment(); if (label == null) { label = homeFile.getName(); @@ -199,7 +200,7 @@ log.debug("Writing home property label" + propertyWikittyService.getOrigin()); propertyWikittyService.setProperty( - WikittyPublicationSynchronize.LABEL_KEY, this.label); + WikittyPublicationSynchronize.LABEL_KEY, label); } // the service use to update or commit String uriService = app @@ -220,12 +221,12 @@ if (app.getOptions().containsKey( WikittyPublicationSynchronize.IS_RECURSION_OPTION)) { - this.recursion = app + recursion = app .getOptionAsBoolean(WikittyPublicationSynchronize.IS_RECURSION_OPTION); } // TODO mfotun-2011-04-28 add a support for filtered file with a // property file - this.directoryNameBlackList = new ArrayList<String>(); + directoryNameBlackList = new ArrayList<String>(); directoryNameBlackList.add(".svn"); directoryNameBlackList.add(".git"); @@ -411,17 +412,17 @@ File wikittyParenFile = new File(path); // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + + PROPERTY_DIRECTORY); if (!propertieDirectory.exists() || !propertieDirectory.isDirectory()) { propertieDirectory.mkdir(); } - String name = ""; - String extension = ""; + String name; + String extension; - File wikittyFile = null; + File wikittyFile; // construct the file differently if wikittyPubData or // wikittyPubText if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { @@ -471,7 +472,7 @@ // update metaProperties .setProperty( - WikittyPublicationFileSystem.META_CURRENT_LABEL, + META_CURRENT_LABEL, ourDir); metaProperties.store(); @@ -572,7 +573,7 @@ if (value != null) { FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; - result.add(this.restore(wikid, localisation)); + result.add(restore(wikid, localisation)); } } @@ -738,7 +739,7 @@ && child.getName().equals(PROPERTY_DIRECTORY)) { result.add(child); } else if (child.isDirectory() && recursivly - && !this.directoryNameBlackList.contains(child.getName())) { + && !directoryNameBlackList.contains(child.getName())) { result.addAll(harvestPropertyDirectory(child, recursivly)); } } @@ -785,7 +786,7 @@ log.debug("ID:" + id + " fileInformation:" + value); - result.put((String) id, value); + result.put(id, value); } } @@ -822,7 +823,7 @@ + starts); File propertieDirectory = new File(starts.getCanonicalPath() + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + + PROPERTY_DIRECTORY); // load/create meta propertie file File propertieFile = new File(propertieDirectory.getCanonicalPath() @@ -883,7 +884,7 @@ // set the current label WikittyLabelHelper.addLabels(result, props - .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL)); + .getProperty(META_CURRENT_LABEL)); // create the correct wikittypubxxx if (mimeHelper.isPubTextMime(mimeType)) { @@ -907,7 +908,7 @@ // re set the version (re set the version now allow the version to be // not altered by operation on the wikitty to restore it result.setVersion(props - .getProperty(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION + .getProperty(META_PREFIX_KEY_VERSION + completeName)); return result; 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-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,15 +24,6 @@ */ package org.nuiton.wikitty.publication.synchro; -import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,6 +44,15 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; + /** * Main class of the sync part of wikitty publication, this class is the entry * point for sync operation. Existing, delete and update. @@ -144,7 +144,7 @@ // allias for norecursion applicationConfig.addAlias("--norecursion", "--option", - WikittyPublicationSynchronize.IS_RECURSION_OPTION, "false"); + IS_RECURSION_OPTION, "false"); applicationConfig.addAlias("--delete", "--option", IS_DELETE_OPTION, "true"); @@ -569,7 +569,7 @@ String wikittyServiceInter = StringUtils.EMPTY; String wikittyServiceFileSystem = StringUtils.EMPTY; - String labelInitial = StringUtils.EMPTY; + String labelInitial; PropertiesExtended homeProperty = null; // Check number of argument switch (uriFileSystem.length) {