- Wikitty-commits - mailman.cloud.codelutin.com

r906 - trunk/wikitty-publication
by mfortun＠users.nuiton.org May 20, 2011

May 20, 2011

Author: mfortun Date: 2011-05-20 12:10:46 +0200 (Fri, 20 May 2011) New Revision: 906 Url: http://nuiton.org/repositories/revision/wikitty/906 Log: * remove redundant dependency * change struts version to 2.2.3 Modified: trunk/wikitty-publication/pom.xml Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-05-19 15:40:38 UTC (rev 905) +++ trunk/wikitty-publication/pom.xml 2011-05-20 10:10:46 UTC (rev 906) @@ -1,78 +1,76 @@ <?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.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> + <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> + <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>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> @@ -86,77 +84,75 @@ </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.8.0.GA</version> + <scope>runtime</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: publication</name> + <name>Wikitty :: publication</name> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <build> + <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> + <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.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> + <plugins> + <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> - - </build> - - <properties> - <struts2Version>2.2.1.1</struts2Version> - </properties> + <properties> + <struts2Version>2.2.3</struts2Version> + </properties> </project>

1 0

r905 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication resources
by mfortun＠users.nuiton.org May 19, 2011

May 19, 2011

Author: mfortun Date: 2011-05-19 17:40:38 +0200 (Thu, 19 May 2011) New Revision: 905 Url: http://nuiton.org/repositories/revision/wikitty/905 Log: * multicontext is ready improvement #1501 Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 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-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-19 15:40:38 UTC (rev 905) @@ -145,10 +145,9 @@ ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), "wikitty-publication-ws-light.properties", String.class, false, false); + // "wikitty-publication-ws-default.properties", String.class, false, false); + - //wikitty-publication-ws-light.properties - //wikitty-publication-ws-default.properties - public final String key; public final String description; public String defaultValue; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-19 15:40:38 UTC (rev 905) @@ -12,6 +12,9 @@ import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; +import org.nuiton.wikitty.entities.WikittyLabel; +import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.search.Criteria; @@ -20,6 +23,8 @@ import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; +import com.arjuna.ats.internal.jdbc.drivers.modifiers.list; + /** * Proxy use by action in wikitty publication it encapsulate two wikitty proxy * because we can have two distinct service use to store wikitty used by @@ -137,6 +142,20 @@ return fallbackProxy.getWikittyService(); } + public String getFallbackSecurityToken() { + String result = ""; + if (isFallbackService()) { + result = fallbackProxy.getSecurityToken(); + } + return result; + } + + public void setFallbackSecurityToken(String securityToken) { + if (isFallbackService()) { + fallbackProxy.setSecurityToken(securityToken); + } + } + /* * Beginning of redefinition method that take care of merge between result * of the proxy and fallback proxy if any @@ -158,17 +177,11 @@ public String getSecurityToken() { String result = mainProxy.getSecurityToken(); - - // TODO mfortun-2011-05-16 do something on fallback ? - return result; } public void setSecurityToken(String securityToken) { mainProxy.setSecurityToken(securityToken); - if (isFallbackService()) { - fallbackProxy.setSecurityToken(securityToken); - } } public WikittyUser getUser() { @@ -216,13 +229,12 @@ if (isFallbackService() && e.getExtensionNames().contains(WikittyUser.EXT_WIKITTYUSER)) { - - BusinessEntity temp = new BusinessEntityImpl(); - temp.copyFrom(e); - - // FIXME mfortun-2011-05-18 here correct what cause the bug + // save the version to restore it after to allow storage of the + // wikitty on the two service + String version = e.getWikittyVersion(); fallbackProxy.store(e); - mainProxy.store(temp); + e.setWikittyVersion(version); + mainProxy.store(e); return e; } @@ -530,7 +542,9 @@ PagedResult<E> resultTempFromFall = fallbackProxy .findAllByExample(e, 0, missingNumber, fieldFacet); - List<E> completedResultList = result.getAll(); + List<E> completedResultList = new ArrayList<E>(); + + completedResultList.addAll(result.getAll()); completedResultList.addAll(resultTempFromFall.getAll()); int totalNumberofFound = result.getNumFound() @@ -559,9 +573,10 @@ public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria( Class<E> clazz, List<Criteria> criterias) { - List<PagedResult<E>> result = mainProxy.findAllByCriteria(clazz, - criterias); + List<PagedResult<E>> result = new ArrayList<PagedResult<E>>(); + result.addAll(mainProxy.findAllByCriteria(clazz, criterias)); + if (isFallbackService()) { for (int i = 0; i < result.size(); i++) { @@ -633,8 +648,10 @@ PagedResult<E> resultFallback = fallbackProxy .findAllByCriteria(clazz, excluding); - List<E> allresult = currentResult.getAll(); + List<E> allresult = new ArrayList<E>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); + int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -707,7 +724,8 @@ PagedResult<E> resultFallback = fallbackProxy .findAllByCriteria(clazz, excluding); - List<E> allresult = result.getAll(); + List<E> allresult = new ArrayList<E>(); + allresult.addAll(result.getAll()); allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -809,7 +827,8 @@ PagedResult<Wikitty> resultFallback = fallbackProxy .findAllByCriteria(excluding); - List<Wikitty> allresult = currentResult.getAll(); + List<Wikitty> allresult = new ArrayList<Wikitty>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -883,7 +902,9 @@ PagedResult<Wikitty> resultFallback = fallbackProxy .findAllByCriteria(excluding); - List<Wikitty> allresult = result.getAll(); + List<Wikitty> allresult = new ArrayList<Wikitty>(); + allresult.addAll(result.getAll()); + allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -984,7 +1005,8 @@ PagedResult<String> resultFallback = fallbackProxy .findAllIdByCriteria(excluding); - List<String> allresult = currentResult.getAll(); + List<String> allresult = new ArrayList<String>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -1053,7 +1075,8 @@ PagedResult<String> resultFallback = fallbackProxy .findAllIdByCriteria(excluding); - List<String> allresult = result.getAll(); + List<String> allresult = new ArrayList<String>(); + allresult.addAll(result.getAll()); allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -1082,17 +1105,20 @@ public List<String> findIdByCriteria(List<Criteria> criteria) { - List<String> result = mainProxy.findIdByCriteria(criteria); + List<String> result = new ArrayList<String>(); + result.addAll(mainProxy.findIdByCriteria(criteria)); if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findIdByCriteria(criteria); + if (result.size() == 0) { + result.addAll(fallbackProxy.findIdByCriteria(criteria)); } else { // merge list - List<String> resultFallback = fallbackProxy - .findIdByCriteria(criteria); + List<String> resultFallback = new ArrayList<String>(); + + resultFallback.addAll(fallbackProxy.findIdByCriteria(criteria)); // this allow to element from main to prevail + resultFallback.removeAll(result); result.addAll(resultFallback); } @@ -1144,11 +1170,12 @@ public <E extends BusinessEntity> List<E> findByCriteria(Class<E> clazz, List<Criteria> criterias) { - List<E> result = mainProxy.findByCriteria(clazz, criterias); + List<E> result = new ArrayList<E>(); + result.addAll(mainProxy.findByCriteria(clazz, criterias)); if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findByCriteria(clazz, criterias); + if (result.size() == 0) { + result.addAll(fallbackProxy.findByCriteria(clazz, criterias)); } else { // merge list List<E> resultFallback = fallbackProxy.findByCriteria(clazz, @@ -1205,11 +1232,13 @@ public List<Wikitty> findByCriteria(List<Criteria> criteria) { - List<Wikitty> result = mainProxy.findByCriteria(criteria); + List<Wikitty> result = new ArrayList<Wikitty>(); + result.addAll(mainProxy.findByCriteria(criteria)); + if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findByCriteria(criteria); + if (result.size() == 0l) { + result.addAll(fallbackProxy.findByCriteria(criteria)); } else { // merge list List<Wikitty> resultFallback = fallbackProxy 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-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-19 15:40:38 UTC (rev 905) @@ -26,8 +26,8 @@ public WikittyPublicationSession() { //proxy = WikittyPublicationProxy.getInstance(null); - //proxy = WikittyPublicationProxy.getInstanceWithFallback(null); proxy = WikittyPublicationProxy.getInstanceWithFallback(null); + } /** Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-19 15:40:38 UTC (rev 905) @@ -42,7 +42,7 @@ <interceptors> <interceptor name="login" class="org.nuiton.wikitty.publication.LoginInterceptor"> - <param name="error">/wikitty-publication/login_input.action</param> + <param name="error">login_input.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> <interceptor-ref name="login" /> Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-19 15:40:38 UTC (rev 905) @@ -24,5 +24,5 @@ ### -wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.service.server.url=http://localhost:1111/wikitty wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-19 15:40:38 UTC (rev 905) @@ -24,5 +24,5 @@ ### -wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.service.server.url=http://localhost:2222/wikitty wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient

1 0

r904 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org May 18, 2011

May 18, 2011

Author: mfortun Date: 2011-05-18 18:08:36 +0200 (Wed, 18 May 2011) New Revision: 904 Url: http://nuiton.org/repositories/revision/wikitty/904 Log: * multicontext need to save user in both, still a bug in there Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 14:51:41 UTC (rev 903) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 16:08:36 UTC (rev 904) @@ -13,6 +13,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -67,7 +68,6 @@ .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); - WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws, configFallBack, fallservice); result.setSecurityToken(token); @@ -102,7 +102,7 @@ if (serviceFallback == null) { serviceFallback = WikittyServiceFactory .buildWikittyService(config); - + } } } @@ -209,6 +209,24 @@ public <E extends BusinessEntity> E store(E e) { E result = null; + + /* + * if a user store in both + */ + if (isFallbackService() + && e.getExtensionNames().contains(WikittyUser.EXT_WIKITTYUSER)) { + + + BusinessEntity temp = new BusinessEntityImpl(); + temp.copyFrom(e); + + // FIXME mfortun-2011-05-18 here correct what cause the bug + fallbackProxy.store(e); + mainProxy.store(temp); + + return e; + } + // if there a fallback proxy and e exist on it, we try to store it again // on fallbackproxy if (isFallbackService() @@ -223,9 +241,18 @@ public Wikitty store(Wikitty w) { Wikitty result = null; + + /* + * if a user store in both + */ + if (isFallbackService() && w.hasExtension(WikittyUser.EXT_WIKITTYUSER)) { + fallbackProxy.store(w); + return mainProxy.store(w); + } + // if there a fallback proxy and e exist on it, we try to store it again // on fallbackproxy - if (isFallbackService() && fallbackProxy.restore(w.getId()) != null) { + if ((isFallbackService() && fallbackProxy.restore(w.getId()) != null)) { result = fallbackProxy.store(w); } else { result = mainProxy.store(w);

1 0

r903 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org May 18, 2011

May 18, 2011

Author: mfortun Date: 2011-05-18 16:51:41 +0200 (Wed, 18 May 2011) New Revision: 903 Url: http://nuiton.org/repositories/revision/wikitty/903 Log: * remove redundant invoke that causes a bug with eval action Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-18 14:25:50 UTC (rev 902) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-18 14:51:41 UTC (rev 903) @@ -65,13 +65,9 @@ if (user == null) { ServletActionContext.getResponse().sendRedirect(error); } else { - result = invocation.invoke(); + result = invocation.invoke(); } - - - - result = invocation.invoke(); return result; }

1 0

r902 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 18, 2011

May 18, 2011

Author: mfortun Date: 2011-05-18 16:25:50 +0200 (Wed, 18 May 2011) New Revision: 902 Url: http://nuiton.org/repositories/revision/wikitty/902 Log: * add light properties that only instanciate client service * remove unused import in jsp * multicontext bug correction Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 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-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-18 14:25:50 UTC (rev 902) @@ -80,7 +80,7 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-fallback.properties", String.class, false, false); + "wikitty-publication-ws-lightfallback.properties", String.class, false, false); @@ -144,10 +144,11 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-default.properties", String.class, false, false); + "wikitty-publication-ws-light.properties", String.class, false, false); + //wikitty-publication-ws-light.properties + //wikitty-publication-ws-default.properties - public final String key; public final String description; public String defaultValue; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 14:25:50 UTC (rev 902) @@ -67,6 +67,7 @@ .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); + WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws, configFallBack, fallservice); result.setSecurityToken(token); @@ -101,6 +102,7 @@ if (serviceFallback == null) { serviceFallback = WikittyServiceFactory .buildWikittyService(config); + } } } 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-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-18 14:25:50 UTC (rev 902) @@ -25,6 +25,8 @@ protected WikittyUser user; public WikittyPublicationSession() { + //proxy = WikittyPublicationProxy.getInstance(null); + //proxy = WikittyPublicationProxy.getInstanceWithFallback(null); proxy = WikittyPublicationProxy.getInstanceWithFallback(null); } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-18 14:25:50 UTC (rev 902) @@ -70,7 +70,7 @@ </action> </package> -  +  <package name="publication" extends="restrictedArea"> <action name="*/edit/*" Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -29,17 +29,15 @@ --%> <%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> <%@page import="java.util.Collection"%> <%@page import="org.nuiton.wikitty.WikittyProxy"%> <%@page import="org.nuiton.wikitty.WikittyService"%> <%@page import="org.nuiton.wikitty.entities.WikittyExtension"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@page import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> + <% PublicationActionEdit action = PublicationActionEdit.getAction(); Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -36,10 +36,6 @@ <%@page import="org.nuiton.wikitty.search.Search"%> <%@page import="org.nuiton.wikitty.publication.WikittyPublicationSession"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> -<%@page - import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -96,7 +92,7 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="/wiki/edit"> + <td><s:url var="editlink" action="wiki/edit"> <s:param name="id"><%=w.getId()%></s:param> </s:url> <s:a href="%{editlink}" id="regenPermToken"> <s:text name="edit" />

1 0

r901 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org May 17, 2011

May 17, 2011

Author: mfortun Date: 2011-05-17 17:34:30 +0200 (Tue, 17 May 2011) New Revision: 901 Url: http://nuiton.org/repositories/revision/wikitty/901 Log: * correct copy/past mistake in initialization for fallback service Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 15:34:30 UTC (rev 901) @@ -32,11 +32,6 @@ public static String WIKITTY_SERVICE_FALLBACK_COMPONNENT_KEY; public static String WIKITTY_SERVICE_FALLBACK_URL_KEY; - /* - * TODO mfortun-2011-05-13 multicontext the begginning, need to think about - * how invoke method in the different proxy properly. - */ - /** * */ @@ -69,7 +64,7 @@ WikittyService ws = getWikittyService(config); ApplicationConfig configFallBack = WikittyPublicationConfig - .getInstance(); + .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); WikittyPublicationProxy result = new WikittyPublicationProxy(config, @@ -1060,12 +1055,8 @@ List<String> result = mainProxy.findIdByCriteria(criteria); - // TODO mfortun-2011-05-17 reform criteria + if (isFallbackService()) { - if (isFallbackService()) { - - - if (result == null) { result = fallbackProxy.findIdByCriteria(criteria); } else { @@ -1463,6 +1454,15 @@ return result; } + /** + * Create a criteria to exclude a list of if from a criteria + * + * @param origin + * the criteria from whom exclude id + * @param toExclude + * list of id to exlude + * @return the criteria excluding ids + */ protected Criteria idNotInCriteriaConstructor(Criteria origin, List<String> toExclude) { Criteria result = null; 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-05-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 15:34:30 UTC (rev 901) @@ -25,7 +25,7 @@ protected WikittyUser user; public WikittyPublicationSession() { - proxy = WikittyPublicationProxy.getInstance(null); + proxy = WikittyPublicationProxy.getInstanceWithFallback(null); } /**

1 0

r900 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org May 17, 2011

May 17, 2011

Author: sletellier Date: 2011-05-17 16:20:57 +0200 (Tue, 17 May 2011) New Revision: 900 Url: http://nuiton.org/repositories/revision/wikitty/900 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.2</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-api/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-dto/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-generators/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-solr/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>

1 0

r899 - in tags: . wikitty-3.1.2
by sletellier＠users.nuiton.org May 17, 2011

May 17, 2011

Author: sletellier Date: 2011-05-17 16:20:55 +0200 (Tue, 17 May 2011) New Revision: 899 Url: http://nuiton.org/repositories/revision/wikitty/899 Log: [maven-release-plugin] copy for tag wikitty-3.1.2 Added: tags/wikitty-3.1.2/ Property changes on: tags/wikitty-3.1.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r898 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org May 17, 2011

May 17, 2011

Author: sletellier Date: 2011-05-17 16:20:52 +0200 (Tue, 17 May 2011) New Revision: 898 Url: http://nuiton.org/repositories/revision/wikitty/898 Log: [maven-release-plugin] prepare release wikitty-3.1.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-api/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-dto/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-generators/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-solr/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>

1 0

r897 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/action resources webapp
by sletellier＠users.nuiton.org May 17, 2011

May 17, 2011

Author: sletellier Date: 2011-05-17 16:18:12 +0200 (Tue, 17 May 2011) New Revision: 897 Url: http://nuiton.org/repositories/revision/wikitty/897 Log: Fix svn:keywords Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LogoutInterceptor.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/PublicationActionLogin.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties trunk/wikitty-publication/src/main/webapp/login.jsp trunk/wikitty-publication/src/main/webapp/register.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LoginInterceptor.java 276 2011-04-29 21:02:55Z bpoussin $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/int… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LogoutInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LoginAction.java 228 2011-03-03 10:59:29Z vbriand $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/act… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LogoutAction.java 192 2011-02-14 14:53:06Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/act… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ # #%L # Wikitty :: publication # -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin # %% Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/register.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0