Author: mfortun Date: 2011-08-08 14:28:44 +0200 (Mon, 08 Aug 2011) New Revision: 1111 Url: http://nuiton.org/repositories/revision/wikitty/1111 Log: *correct dependency for logging *include i18N Added: trunk/wikitty-publication/src/main/resources/log4j.properties Modified: trunk/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_en_GB.properties trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_fr_FR.properties trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/pom.xml 2011-08-08 12:28:44 UTC (rev 1111) @@ -193,6 +193,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + <version>${nuitonProcessessorVersion}</version> + </dependency> + <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> @@ -553,7 +559,8 @@ <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> <jspapiversion>2.1</jspapiversion> - + + <nuitonProcessessorVersion>1.2.2-SNAPSHOT</nuitonProcessessorVersion> <nuiton-struts2>1.3</nuiton-struts2> <!--Multilanguage maven-site --> <locales>fr,en</locales> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/pom.xml 2011-08-08 12:28:44 UTC (rev 1111) @@ -118,10 +118,26 @@ <dependency> <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - <version>1.2.2-SNAPSHOT</version> + <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>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> <!-- ************************************************************* --> 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-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-08 12:28:44 UTC (rev 1111) @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; import org.apache.struts2.interceptor.SessionAware; +import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -10,8 +11,8 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionSupport; + /** * Base action that wikitty publication will extend, needed to work within a * struts architecture. @@ -19,7 +20,7 @@ * @author mfortun * */ -public class PublicationBaseAction extends ActionSupport implements +public class PublicationBaseAction extends BaseAction implements SessionAware { /** @@ -38,6 +39,8 @@ static public String ARGS_KEY = "args"; protected Map<String, Object> session; + + public WikittyPublicationSession getWikittyPublicationSession() { WikittyPublicationSession result = WikittyPublicationSession Modified: trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_en_GB.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_en_GB.properties 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_en_GB.properties 2011-08-08 12:28:44 UTC (rev 1111) @@ -1,3 +1,6 @@ +publication.edit.addExtension=addExtension +publication.edit.delete=Delete +publication.edit.save=Save publication.login.login=User publication.login.password=Password publication.login.repeatPassword=Password @@ -2,2 +5,7 @@ publication.register.submit=Subscribe -wikitty-publication.config.configFileName.description= +publication.view.founds=Wikitty Aviables +publication.view.next=Next +publication.view.previous=Previous +publication.view.search=Search +publication.view.title=Wikitty View +wikitty-publication.config.configFileName.description=Default wikitty publication config Modified: trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_fr_FR.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_fr_FR.properties 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/src/main/resources/i18n/wikitty-publication_fr_FR.properties 2011-08-08 12:28:44 UTC (rev 1111) @@ -1,5 +1,14 @@ +publication.edit.addExtension=Ajouter Extension +publication.edit.delete=Suppression +publication.edit.save=Sauvegarde publication.login.login=Utilisateur publication.login.password=Mot de passe publication.login.repeatPassword=Mot de passe +publication.login.submit=login publication.register.submit=Inscription -wikitty-publication.config.configFileName.description= +publication.view.founds=Wikitty Trouvés +publication.view.next=Suivant +publication.view.previous=Précédent +publication.view.search=Recherche +publication.view.title=Vue des wikitty +wikitty-publication.config.configFileName.description=Fichier de configuration pat défault de wikitty Publication Added: trunk/wikitty-publication/src/main/resources/log4j.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/log4j.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/log4j.properties 2011-08-08 12:28:44 UTC (rev 1111) @@ -0,0 +1,12 @@ +# Global logging configuration +log4j.rootLogger=FATAL, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.nuiton.wikitty.publication=DEBUG +#log4j.logger.org.nuiton.util.TimeLog=WARN +log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-08 12:28:44 UTC (rev 1111) @@ -120,7 +120,7 @@ } %> - <input type="submit" name="addExtension" value="<%=I18n._("publication.edit.addExtension")%>" /> + <input type="submit" name="addExtension" value="<%=action.getText("publication.edit.addExtension")%>" /> </fieldset> <% @@ -217,7 +217,7 @@ } %> - <input type="submit" name="store" value="<%=I18n._("publication.edit.save")%>" /> - <input type="submit" name="delete" value="<%=I18n._("publication.edit.delete")%>" /> + <input type="submit" name="store" value="<%=action.getText("publication.edit.save") %>" /> + <input type="submit" name="delete" value="<%=action.getText("publication.edit.delete") %>" /> </form> \ No newline at end of file Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-05 16:06:49 UTC (rev 1110) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-08 12:28:44 UTC (rev 1111) @@ -43,8 +43,6 @@ <%@taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> -<h1>Wikitty View</h1> - <% WikittyPublicationSession wpSession = WikittyPublicationSession .getWikittyPublicationSession(session); @@ -56,6 +54,11 @@ if (wikit != null) { %> + + +<h1><%=action.getText("publication.view.title") %></h1> + + <pre><%=StringEscapeUtils.escapeHtml(String .valueOf(wikit))%></pre> <% @@ -77,9 +80,9 @@ </div> <s:textfield label="First" key="first" name="first" /> <s:textfield label="End" key="end" name="end" /> - <input type="submit" name="search" value="Search" /> + <input type="submit" name="search" value="<%=action.getText("publication.view.search") %>" /> - <pre> Wikitty Aviable: <%=action.getPagedResult().getNumFound()%></pre> + <pre> <%=action.getText("publication.view.founds") %>: <%=action.getPagedResult().getNumFound()%></pre> <br/> @@ -130,8 +133,9 @@ </table> - <input type="submit" name="previous" value="previous" /> <input - type="submit" name="next" value="next" /> + <input type="submit" name="previous" value=" + <%=action.getText("publication.view.previous") %>" /> <input + type="submit" name="next" value="<%=action.getText("publication.view.next") %>" /> </form>