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

r690 - in trunk: wikitty-api wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test
by jcouteau＠users.nuiton.org 27 Jan '11

27 Jan '11

Author: jcouteau Date: 2011-01-27 10:57:22 +0100 (Thu, 27 Jan 2011) New Revision: 690 Url: http://nuiton.org/repositories/revision/wikitty/690 Log: Remove unused dependency Modified: trunk/wikitty-api/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-perf-test/pom.xml Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-01-27 09:10:33 UTC (rev 689) +++ trunk/wikitty-api/pom.xml 2011-01-27 09:57:22 UTC (rev 690) @@ -16,127 +16,104 @@ <artifactId>wikitty-api</artifactId> <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - -  +   <dependency> - <groupId>gnu.cajo</groupId> - <artifactId>cajo</artifactId> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> </dependency> -  - <dependency> - <groupId>org.apache.jcs</groupId> - <artifactId>jcs</artifactId> - </dependency> +  + <dependency> + <groupId>org.apache.jcs</groupId> + <artifactId>jcs</artifactId> + </dependency> -  - <dependency> - <groupId>net.iharder</groupId> - <artifactId>base64</artifactId> - </dependency> +  + <dependency> + <groupId>net.iharder</groupId> + <artifactId>base64</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> -  - <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossjta</artifactId> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> +  + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> -  - <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </dependency> +  + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> -  - <dependency> - <groupId>jivesoftware</groupId> - <artifactId>smack</artifactId> - </dependency> +  + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + </dependency> - <dependency> - <groupId>jivesoftware</groupId> - <artifactId>smackx</artifactId> - </dependency> + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smackx</artifactId> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> </dependencies> -  -  -  +  +  +  <name>Wikitty :: api</name> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-01-27 09:10:33 UTC (rev 689) +++ trunk/wikitty-hessian-server/pom.xml 2011-01-27 09:57:22 UTC (rev 690) @@ -26,7 +26,7 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>org.eclipse.jetty</groupId> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-01-27 09:10:33 UTC (rev 689) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-01-27 09:57:22 UTC (rev 690) @@ -40,34 +40,8 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>test</scope> - </dependency> -  <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-01-27 09:10:33 UTC (rev 689) +++ trunk/wikitty-perf-test/pom.xml 2011-01-27 09:57:22 UTC (rev 690) @@ -30,24 +30,6 @@ </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency>

1 0

r689 - trunk
by jcouteau＠users.nuiton.org 27 Jan '11

27 Jan '11

Author: jcouteau Date: 2011-01-27 10:10:33 +0100 (Thu, 27 Jan 2011) New Revision: 689 Url: http://nuiton.org/repositories/revision/wikitty/689 Log: Up to mavenpom 2.4.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 11:00:56 UTC (rev 688) +++ trunk/pom.xml 2011-01-27 09:10:33 UTC (rev 689) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> </parent>

1 0

r688 - in trunk/wikitty-dto: . src/main/resources/org/nuiton
by jcouteau＠users.nuiton.org 26 Jan '11

26 Jan '11

Author: jcouteau Date: 2011-01-26 12:00:56 +0100 (Wed, 26 Jan 2011) New Revision: 688 Url: http://nuiton.org/repositories/revision/wikitty/688 Log: Remove DTOHelper from GWT module Modified: trunk/wikitty-dto/pom.xml trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-01-25 11:47:04 UTC (rev 687) +++ trunk/wikitty-dto/pom.xml 2011-01-26 11:00:56 UTC (rev 688) @@ -57,12 +57,6 @@ <build> - <resources> - <resource> - <directory>${project.basedir}/src/main/resources</directory> - </resource> - </resources> - <plugins> <plugin> Modified: trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml =================================================================== --- trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml 2011-01-25 11:47:04 UTC (rev 687) +++ trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml 2011-01-26 11:00:56 UTC (rev 688) @@ -27,7 +27,8 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> <module> - <source path="wikitty/entities"> - <include name="*DTO.java"/> + <source path="wikitty/dto"> + <exclude name="*.java"/> </source> + <source path="wikitty/entities"/> </module> \ No newline at end of file

1 0

r687 - in trunk/wikitty-dto: . src/main/resources src/main/resources/org src/main/resources/org/nuiton
by jcouteau＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: jcouteau Date: 2011-01-25 12:47:04 +0100 (Tue, 25 Jan 2011) New Revision: 687 Url: http://nuiton.org/repositories/revision/wikitty/687 Log: Fix gwt module path :( Added: trunk/wikitty-dto/src/main/resources/org/ trunk/wikitty-dto/src/main/resources/org/nuiton/ trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml Removed: trunk/wikitty-dto/src/main/resources/org.nuiton/ Modified: trunk/wikitty-dto/pom.xml Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-01-25 09:21:24 UTC (rev 686) +++ trunk/wikitty-dto/pom.xml 2011-01-25 11:47:04 UTC (rev 687) @@ -57,7 +57,14 @@ <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + </resources> + <plugins> + <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> Added: trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml =================================================================== --- trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml (rev 0) +++ trunk/wikitty-dto/src/main/resources/org/nuiton/WikittyDTO.gwt.xml 2011-01-25 11:47:04 UTC (rev 687) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <source path="wikitty/entities"> + <include name="*DTO.java"/> + </source> +</module> \ No newline at end of file

1 0

r686 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: jcouteau Date: 2011-01-25 10:21:24 +0100 (Tue, 25 Jan 2011) New Revision: 686 Url: http://nuiton.org/repositories/revision/wikitty/686 Log: Fix bad doc rendering Modified: trunk/src/site/rst/generation.rst Modified: trunk/src/site/rst/generation.rst =================================================================== --- trunk/src/site/rst/generation.rst 2011-01-25 09:20:57 UTC (rev 685) +++ trunk/src/site/rst/generation.rst 2011-01-25 09:21:24 UTC (rev 686) @@ -40,41 +40,41 @@ Dans le pom de votre projet, rajoutez la définition du plugin:: -<plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>2.2/version> - <executions> - <execution> - <id>api generator</id> - <phase>process-sources</phase> - <configuration> - <inputs> - <input>zargo:src/main/xmi/:*.zargo</input> - <input>classpath:model:/:wikitty.objectmodel - </input> - </inputs> - <fullPackagePath>your.app.package</fullPackagePath> - <defaultPackage>your.app.package</defaultPackage> - <extractedPackages> - your.app.package,org.nuiton.wikitty - </extractedPackages> - <generatedPackages>your.app.package</generatedPackages> - <templates> - org.nuiton.wikitty.generator.WikittyMetaGenerator, - org.nuiton.wikitty.generator.WikittyDTOGenerator - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> -</plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>2.2/version> + <executions> + <execution> + <id>api generator</id> + <phase>process-sources</phase> + <configuration> + <inputs> + <input>zargo:src/main/xmi/:*.zargo</input> + <input>classpath:model:/:wikitty.objectmodel + </input> + </inputs> + <fullPackagePath>your.app.package</fullPackagePath> + <defaultPackage>your.app.package</defaultPackage> + <extractedPackages> + your.app.package,org.nuiton.wikitty + </extractedPackages> + <generatedPackages>your.app.package</generatedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator, + org.nuiton.wikitty.generator.WikittyDTOGenerator + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> Dans la section *inputs*, on spécifie le(s) modèle(s) métier:: -zargo:src/main/xmi/:*.zargo + zargo:src/main/xmi/:*.zargo ainsi que le modèle Wikitty (en cas de dépendance de votre modèle métier vers le modèle Wikitty).

1 0

r685 - trunk
by jcouteau＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: jcouteau Date: 2011-01-25 10:20:57 +0100 (Tue, 25 Jan 2011) New Revision: 685 Url: http://nuiton.org/repositories/revision/wikitty/685 Log: Update to nuiton-i18n 2.0-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-20 12:10:03 UTC (rev 684) +++ trunk/pom.xml 2011-01-25 09:20:57 UTC (rev 685) @@ -502,7 +502,7 @@  <eugeneVersion>2.3</eugeneVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.0.1</nuitonI18nVersion> <processPluginVersion>1.0.3</processPluginVersion>

1 0

r684 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by jcouteau＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: jcouteau Date: 2011-01-20 13:10:03 +0100 (Thu, 20 Jan 2011) New Revision: 684 Url: http://nuiton.org/repositories/revision/wikitty/684 Log: Use n_() instead of _() in option, better for i18n initialisation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-01-19 13:56:39 UTC (rev 683) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-01-20 12:10:03 UTC (rev 684) @@ -28,7 +28,9 @@ import org.nuiton.wikitty.services.WikittyServiceInMemory; import java.io.File; import java.util.Properties; + import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -126,222 +128,222 @@ WIKITTY_CONFIG_FILE( CONFIG_FILE_NAME, - _("Main configuration wikitty file"), + n_("Main configuration wikitty file"), "wikitty-config.properties", String.class, true, true), WIKITTY_DATA_DIR( "wikitty.data.directory", - _("Data directory where wikitty store data"), + n_("Data directory where wikitty store data"), "./target/data", String.class, false, false), WIKITTY_STORAGE_JDBC_QUERY_FILE( "wikitty.storage.jdbc.queryfile", - _("JDBC query configuration file. You can put more than one file" - + " to load specific SQL statement for your database." - + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), + n_("JDBC query configuration file. You can put more than one file" + + " to load specific SQL statement for your database." + + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), "wikitty-jdbc-query.properties", String.class, false, false), WIKITTY_STORAGE_JDBC_DRIVER( "wikitty.storage.jdbc.driver", - _("JDBC driver name"), + n_("JDBC driver name"), "org.h2.Driver", String.class, false, false), WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", - _("JDBC url"), + n_("JDBC url"), "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", - _("JDBC login name"), + n_("JDBC login name"), "sa", String.class, false, false), WIKITTY_STORAGE_JDBC_PASSWORD( "wikitty.storage.jdbc.password", - _("JDBC password"), + n_("JDBC password"), "", String.class, false, false), WIKITTY_STORAGE_JDBC_XADATASOURCE( "wikitty.storage.jdbc.xadatasource", - _("JDBC xadatasource driver"), + n_("JDBC xadatasource driver"), "org.h2.jdbcx.JdbcDataSource", String.class, false, false), WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_URL( "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL", - _("JDBC xadatasource property h2 url"), + n_("JDBC xadatasource property h2 url"), "${"+WIKITTY_STORAGE_JDBC_URL.getKey() + "}", String.class, false, false), WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_USER( "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user", - _("JDBC xadatasource property h2 username"), + n_("JDBC xadatasource property h2 username"), "${"+WIKITTY_STORAGE_JDBC_LOGIN.getKey() + "}", String.class, false, false), WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_PASSWORD( "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password", - _("JDBC xadatasource property h2 password"), + n_("JDBC xadatasource property h2 password"), "${"+WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", String.class, false, false), WIKITTY_SEARCHENGINE_SOLR_HOME( "wikitty.searchengine.solr.home", - _("SolR directory home. You can put solr.xml config file in. If" - + " not null, replace solr.solr.home environment vairable"), + n_("SolR directory home. You can put solr.xml config file in. If" + + " not null, replace solr.solr.home environment vairable"), null, String.class, false, false), /* Solr config name are used directly in solr config file. If * you change it, change too in module * wikitty-solr-impl/src/main/resources/solrconfig.xml */ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", - _("Solr data directory"), + n_("Solr data directory"), "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", - _("SolR storage type possible value: solr.StandardDirectoryFactory" - + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" - + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), + n_("SolR storage type possible value: solr.StandardDirectoryFactory" + + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" + + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), "solr.StandardDirectoryFactory", String.class, false, false), WIKITTY_WIKITTYSERVICE_COMPONENTS( "wikitty.WikittyService.components", - _("WikittyService to use (list must be in right order. " - + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier,org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), + n_("WikittyService to use (list must be in right order. " + + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier,org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), WikittyServiceInMemory.class.getName(), String.class, false, false), WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( "wikitty.WikittyServiceInMemory.persistence", - _("Indique si les donnees sont stocker entre deux utilisations."), + n_("Indique si les donnees sont stocker entre deux utilisations."), "false", Boolean.class, false, false), WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", - _("Fichier ou les donnees sont stocker"), + n_("Fichier ou les donnees sont stocker"), "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( "wikitty.WikittyServiceStorage.components", - _("WikittyServiceStorage component to use (ExtensionStorage, WikittyStorage, SearchEngine)"), + n_("WikittyServiceStorage component to use (ExtensionStorage, WikittyStorage, SearchEngine)"), "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", String.class, false, false), WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( "wikitty.WikittyServiceNotifier.components", - _("WikittyServiceNotifier component to use (transporter class" - + "to use for propagate or listen remote event)"), + n_("WikittyServiceNotifier component to use (transporter class" + + "to use for propagate or listen remote event)"), XMPPNotifierTransporter.class.getName(), String.class, false, false), WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS( "wikitty.transaction.WikittyService.components", - _("WikittyService to use for transaction (must be in memory)" - + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" - + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), + n_("WikittyService to use for transaction (must be in memory)" + + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" + + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), WikittyServiceInMemory.class.getName(), String.class, false, false), WIKITTY_WIKITTYSERVICECACHED_COMPONENTS( "wikitty.WikittyServiceCached.components", - _("Indique le composant a utiliser pour le cache"), + n_("Indique le composant a utiliser pour le cache"), WikittyCacheJCS.class.getName(), String.class, false, false), WIKITTY_CACHE_PRIORITY_EXTENSIONS( "wikitty.service.cache.priority.extensions", - _("Indique la liste des extensions qui doivent etre conservee prioritairement"), + n_("Indique la liste des extensions qui doivent etre conservee prioritairement"), "", String.class, false, false), WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE( "wikitty.service.cache.simple.reference.type", - _("Indique le type de reference a utiliser pour les extensions" - + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), + n_("Indique le type de reference a utiliser pour les extensions" + + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), "soft", String.class, false, false), WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS( "wikitty.WikittyServiceAccessStat.components", - _("Indique le composant a utiliser pour le stockage des acces"), + n_("Indique le composant a utiliser pour le stockage des acces"), AccessStatStorageWikitty.class.getName(), String.class, false, false), WIKITTY_ACCESSSTAT_EXTENSIONS( "wikitty.service.accessstat.extensions", - _("Indique la liste d'extension dont il faut monitorer l'acces"), + n_("Indique la liste d'extension dont il faut monitorer l'acces"), "WikittyPubText,WikittyPubData", String.class, false, false), WIKITTY_SERVER_CONFIG( "wikitty.service.server.config", - _("Jetty server configuration file name"), + n_("Jetty server configuration file name"), "wikitty-server-config.xml", String.class, false, false), WIKITTY_SERVER_URL( "wikitty.service.server.url", - _("Hessian server url, use by server to know path and port to bind" - + " servlet and client to contact server"), + n_("Hessian server url, use by server to know path and port to bind" + + " servlet and client to contact server"), "http://service.codelutin.com/wikitty", String.class, false, false), WIKITTY_EXPORT_THREADNUMBER( "wikitty.addon.export.threadnumber", - _("number of thread used to export task"), + n_("number of thread used to export task"), "1", Integer.class, false, false), WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", - _("directory path where export asynchronous file are stored"), + n_("directory path where export asynchronous file are stored"), "${" + WIKITTY_DATA_DIR.getKey() + "}/export", String.class, false, false), WIKITTY_EXPORT_PUBLICURL( "wikitty.addon.export.publicurl", - _("url used by client to retrieve export file when job is ended"), + n_("url used by client to retrieve export file when job is ended"), "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", - _("Indique si le cache retourne des copies des objets ou des proxies"), + n_("Indique si le cache retourne des copies des objets ou des proxies"), "false", Boolean.class, false, false), WIKITTY_EVENT_PROPAGATE( "wikitty.service.event.propagate", - _("Indique si le service d'event propage sur le reseau les evenements"), + n_("Indique si le service d'event propage sur le reseau les evenements"), "false", Boolean.class, false, false), WIKITTY_EVENT_LISTEN( "wikitty.service.event.listen", - _("Indique si le service d'event ecoute sur le reseau les evenements"), + n_("Indique si le service d'event ecoute sur le reseau les evenements"), "false", Boolean.class, false, false), WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( "wikitty.service.event.transporter.xmpp.server", - _("XMPP server to use for XMPP transporter"), + n_("XMPP server to use for XMPP transporter"), "im.codelutin.com", String.class, false, false), WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM( "wikitty.service.event.transporter.xmpp.room", - _("Room to use for XMPP transporter"), + n_("Room to use for XMPP transporter"), "test(a)conference.im.codelutin.com", String.class, false, false), WIKITTY_SLAVE_SYNC_STATE_INTERVALE( "wikitty.service.slave.sync.state.intervale", - _("Intervale in second where slave service save state" - + " synchronisation time"), + n_("Intervale in second where slave service save state" + + " synchronisation time"), "300", Integer.class, false, false), WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", - _("File path to store synchronisation state"), + n_("File path to store synchronisation state"), "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", - _("Master url service, where to delegate modification action"), + n_("Master url service, where to delegate modification action"), null, String.class, false, false), WIKITTY_SLAVE_MASTER_XMPP_SERVER( "wikitty.service.slave.master.xmpp.server", - _("XMPP server to use for synchronization with master"), + n_("XMPP server to use for synchronization with master"), "im.codelutin.com", String.class, false, false), WIKITTY_SLAVE_MASTER_XMPP_ROOM( "wikitty.service.slave.master.xmpp.room", - _("Room to use for synchronization with master," - + " this room must have history activated"), + n_("Room to use for synchronization with master," + + " this room must have history activated"), "test(a)conference.im.codelutin.com", String.class, false, false), WIKITTY_PROXY_TIME_TO_LOG_INFO( "wikitty.proxy.timeToLog.info", - _("maximum time before send log info with time consumed"), + n_("maximum time before send log info with time consumed"), "1000", Integer.class, false, false), WIKITTY_PROXY_TIME_TO_LOG_WARN( "wikitty.proxy.timeToLog.warn", - _("maximum time before send log warn with time consumed"), + n_("maximum time before send log warn with time consumed"), "3000", Integer.class, false, false), JCS_DEFAULT( "jcs.default", - _("jcs auxiliares to use"), + n_("jcs auxiliares to use"), "", String.class, false, false), JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS( "jcs.default.cacheattributes.MaxObjects", - _("jcs maximum number of items allowed in memory"), + n_("jcs maximum number of items allowed in memory"), "1000", String.class, false, false); public String key; @@ -408,7 +410,7 @@ public static enum WikittyAction implements ActionDef { - HELP(_("Wikitty help"), + HELP(n_("Wikitty help"), WikittyConfig.class.getName() + "#help", "-h", "--help"); public String description; @@ -452,12 +454,12 @@ System.out.println("Wikitty configuration and action"); System.out.println("Options (set with --option <key> <value>:"); for (WikittyOption o : WikittyOption.values()) { - log.debug("\t" + o.key + "(" + o.defaultValue + "):" + o.description); + log.debug("\t" + o.key + "(" + o.defaultValue + "):" + _(o.description)); } log.debug("Actions:"); for (WikittyAction a : WikittyAction.values()) { - log.debug("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); + log.debug("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + _(a.description)); } System.exit(0); }

1 0

r683 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons
by jcouteau＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: jcouteau Date: 2011-01-19 14:56:39 +0100 (Wed, 19 Jan 2011) New Revision: 683 Url: http://nuiton.org/repositories/revision/wikitty/683 Log: Evolution #1207 - Add methods to import/export using writer/reader Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-01-17 14:30:13 UTC (rev 682) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-01-19 13:56:39 UTC (rev 683) @@ -127,6 +127,10 @@ public void syncImport(FORMAT format, String s) { Reader reader = new StringReader(s); + syncImport(format, reader); + } + + public void syncImport(FORMAT format, Reader reader) { ImportTask task = new ImportTask(securityToken, config, ws, format, reader); task.run(); } @@ -187,6 +191,19 @@ } /** + * Synchronous export by example. + * + * @param format export format + * @param e sample + * @return export string + */ + public void syncExportAllByExample(FORMAT format, BusinessEntityImpl e, + Writer writer) { + Criteria criteria = Search.query(e.getWikitty()).criteria(); + syncExportAllByCriteria(format, criteria, writer); + } + + /** * Asynchronous export by criteria. * * @param format export format @@ -222,10 +239,21 @@ */ public String syncExportAllByCriteria(FORMAT format, Criteria criteria) { StringWriter result = new StringWriter(); + syncExportAllByCriteria(format, criteria, result); + return result.toString(); + } + + /** + * Synchronous export by criteria. + * + * @param format export format + * @param criteria criteria + * @return export as string + */ + public void syncExportAllByCriteria(FORMAT format, Criteria criteria, Writer writer) { ExportTask task = new ExportTask( - securityToken, ws, format, criteria, result); + securityToken, ws, format, criteria, writer); task.run(); - return result.toString(); } /**

1 0

r682 - in trunk: . wikitty-api wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 17 Jan '11

17 Jan '11

Author: bpoussin Date: 2011-01-17 15:30:13 +0100 (Mon, 17 Jan 2011) New Revision: 682 Url: http://nuiton.org/repositories/revision/wikitty/682 Log: Evolution #1204: Add cajo client/server protocole Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java Modified: trunk/pom.xml trunk/wikitty-api/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-10 21:32:44 UTC (rev 681) +++ trunk/pom.xml 2011-01-17 14:30:13 UTC (rev 682) @@ -35,6 +35,13 @@ <dependencyManagement> <dependencies> +  + <dependency> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> + <version>1.168</version> + </dependency> +  <dependency> <groupId>org.apache.jcs</groupId> @@ -209,7 +216,7 @@ <version>1.2.2</version> </dependency> -  +  <dependency> <groupId>jivesoftware</groupId> <artifactId>smack</artifactId> @@ -495,7 +502,7 @@  <eugeneVersion>2.3</eugeneVersion> - <nuitonUtilsVersion>1.5.2</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.0.1</nuitonI18nVersion> <processPluginVersion>1.0.3</processPluginVersion> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-01-10 21:32:44 UTC (rev 681) +++ trunk/wikitty-api/pom.xml 2011-01-17 14:30:13 UTC (rev 682) @@ -47,6 +47,12 @@  +  + <dependency> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> + </dependency> +  <dependency> <groupId>org.apache.jcs</groupId> Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java 2011-01-17 14:30:13 UTC (rev 682) @@ -0,0 +1,48 @@ +package org.nuiton.wikitty.services; + + +import gnu.cajo.utils.extra.TransparentItemProxy; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyService; + +/** + * Cajo client part, this client must be used with {@link WikittyServiceCajoServer} + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceCajoClient extends WikittyServiceDelegator { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceCajoClient.class); + + public WikittyServiceCajoClient(ApplicationConfig config) { + try { + String url = config.getOption(WikittyConfig.WikittyOption. + WIKITTY_SERVER_URL.getKey()); + + // cajo url is not http or other protocol, url must start with // + // example: //localhost:1198/ws + // remove protocol + int i = url.indexOf("://"); + if (i >= 0) { + url = url.substring(i+1); + } + + log.info(String.format("Looking for serveur '%s'", url)); + WikittyService ws = (WikittyService) TransparentItemProxy.getItem( + url, new Class[]{WikittyService.class}); + setDelegate(ws); + } catch (Exception eee) { + throw new WikittyException("Can't find wikitty server", eee); + } + } + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java 2011-01-17 14:30:13 UTC (rev 682) @@ -0,0 +1,88 @@ +package org.nuiton.wikitty.services; + + +import gnu.cajo.invoke.Remote; +import gnu.cajo.utils.ItemServer; +import java.net.URL; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyService; + +/** + * Cajo server to used wikitty as client/server on cajo protocol (rmi based + * protocol). see <a href="http://cajo.dev.java.net">http://cajo.dev.java.net</a> + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceCajoServer extends WikittyServiceDelegator { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceCajoServer.class); + + protected int port = 80; + protected String path = ""; + + public WikittyServiceCajoServer(ApplicationConfig config, WikittyService ws) { + try { + setDelegate(ws); + + // port and path from hessian server url in config + String urlString = config.getOption(WikittyConfig.WikittyOption. + WIKITTY_SERVER_URL.getKey()); + + // get port and path part of server url, only that is used for cajo + if (urlString != null && !"".equals(urlString)) { + URL url = new URL(urlString); + if (-1 != url.getPort()) { + port = url.getPort(); + } + if (null != url.getPath()) { + path = url.getPath(); + } + } + + if ("".equals(path)) { + path = "WikittyService"; + } else if(path.startsWith("/")) { + path = path.substring(1); + } + + Remote.config(null, port, null, 0); + ItemServer.bind(this, path); + log.info(String.format("The server is running on %s:%s/%s", + Remote.getDefaultServerHost(), Remote.getDefaultServerPort(), path) ); + } catch (Exception eee) { + throw new WikittyException("Can't start wikitty server", eee); + } + } + + /** + * get port number of the service, default: 80 + * @return + */ + public int getPort() { + return port; + } + + /** + * get path used to bind server, default: WikittyService + * @return + */ + public String getPath() { + return path; + } + + /** + * stop the server + */ + public void stop() { + ItemServer.unbind(path); + } +} Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2011-01-17 14:30:13 UTC (rev 682) @@ -0,0 +1,80 @@ +package org.nuiton.wikitty.services; + + +import gnu.cajo.utils.ItemServer; +import java.util.Collections; +import java.util.List; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceCajoTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceCajoTest.class); + + static final protected String url = "http://localhost:1198/ws"; + + protected WikittyService startServer() throws Exception { + Properties props = new Properties(); + props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + url); + props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + WikittyServiceInMemory.class.getName() + "," + + WikittyServiceCajoServer.class.getName()); + WikittyConfig config = new WikittyConfig(props); + WikittyService result = WikittyServiceFactory.buildWikittyService(config); + return result; + } + + protected void stopServer(WikittyService ws) { + if (ws instanceof WikittyServiceCajoServer) { + ((WikittyServiceCajoServer)ws).stop(); + } + } + + protected WikittyService getClient() throws Exception { + Properties props = new Properties(); + props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + url); + props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + WikittyServiceCajoClient.class.getName()); + WikittyConfig config = new WikittyConfig(props); + WikittyService result = WikittyServiceFactory.buildWikittyService(config); + return result; + } + + + @Test + public void testCajo() throws Exception { + WikittyService server = startServer(); + WikittyService client = getClient(); + + WikittyProxy proxy = new WikittyProxy(client); + + Wikitty w = new WikittyImpl(); + proxy.store(w); + + List<Wikitty> list = server.restore(null, Collections.singletonList(w.getId())); + Assert.assertEquals(1, list.size()); + + stopServer(server); + } + +}

1 0

r681 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-perf-test wikitty-publication wikitty-solr-impl
by sletellier＠users.nuiton.org 10 Jan '11

10 Jan '11

Author: sletellier Date: 2011-01-10 22:32:44 +0100 (Mon, 10 Jan 2011) New Revision: 681 Url: http://nuiton.org/repositories/revision/wikitty/681 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-impl/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> <modules> @@ -353,10 +353,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.0.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.0.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-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-api/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-dto/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-generators/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-hessian-client/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-hessian-server/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-jdbc-impl/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-perf-test/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-publication/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2011-01-10 21:32:39 UTC (rev 680) +++ trunk/wikitty-solr-impl/pom.xml 2011-01-10 21:32:44 UTC (rev 681) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> </parent>

1 0