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

r654 - in trunk: wikitty-perf-test/src/license wikitty-publication/src/license
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 15:41:22 +0100 (Thu, 23 Dec 2010) New Revision: 654 Url: http://nuiton.org/repositories/revision/wikitty/654 Log: Add missing svn keywords Modified: trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties trunk/wikitty-publication/src/license/THIRD-PARTY.properties Property changes on: trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r653 - in trunk/wikitty-api: . src/it/generation src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2 src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 15:38:07 +0100 (Thu, 23 Dec 2010) New Revision: 653 Url: http://nuiton.org/repositories/revision/wikitty/653 Log: Comment integration tests Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-12-23 13:10:33 UTC (rev 652) +++ trunk/wikitty-api/pom.xml 2010-12-23 14:38:07 UTC (rev 653) @@ -241,7 +241,11 @@ </build> </profile> - <profile> +  + +  </profiles> Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 13:10:33 UTC (rev 652) +++ trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 14:38:07 UTC (rev 653) @@ -32,7 +32,7 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>test-purifier</artifactId> - <version>3.0</version> + <version>3.0-SNAPSHOT</version> <dependencies> @@ -99,7 +99,7 @@  -  + </execution> <execution> <id>entities3 generator</id> @@ -129,7 +129,7 @@  -  + </execution> <execution> <id>entities5 generator</id> Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java 2010-12-23 13:10:33 UTC (rev 652) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java 2010-12-23 14:38:07 UTC (rev 653) @@ -38,25 +38,25 @@ @Test public void testUser() { -// User u = new UserImpl(); -// -// u.getLastName(); -// u.setLastName("lastName"); + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); } @Test public void testUser2() { -// User2 u = new User2Impl(); -// -// u.getLastName(); -// u.setLastName("lastName"); + User2 u = new User2Impl(); + + u.getLastName(); + u.setLastName("lastName"); } @Test public void testAgent() { -// Agent a = new AgentImpl(); -// a.getLastName(); -// a.setLastName("lastName"); -// //TODO Should have specialized metho to access lastName from User and User2 ? + Agent a = new AgentImpl(); + a.getLastName(); + a.setLastName("lastName"); + //TODO Should have specialized metho to access lastName from User and User2 ? } } Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java 2010-12-23 13:10:33 UTC (rev 652) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java 2010-12-23 14:38:07 UTC (rev 653) @@ -38,31 +38,31 @@ @Test public void testUser() { -// User u = new UserImpl(); -// -// u.getLastName(); -// u.setLastName("lastName"); + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); } @Test public void testUser2() { -// User2 u = new User2Impl(); -// -// u.getLastName(); -// u.setLastName("lastName"); -// -// u.getToto(); -// u.setToto("toto"); + User2 u = new User2Impl(); + + u.getLastName(); + u.setLastName("lastName"); + + u.getToto(); + u.setToto("toto"); } @Test public void testAgent() { -// Agent a = new AgentImpl(); -// -// a.getLastName(); -// a.setLastName("lastName"); -// -// a.getToto(); -// a.setToto("toto"); + Agent a = new AgentImpl(); + + a.getLastName(); + a.setLastName("lastName"); + + a.getToto(); + a.setToto("toto"); } }

1 0

r652 - in trunk/wikitty-api/src/it/generation: . src/test/java/org/nuiton/wikitty/test/entities2 src/test/java/org/nuiton/wikitty/test/entities4 src/test/java/org/nuiton/wikitty/test/entities5
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 14:10:33 +0100 (Thu, 23 Dec 2010) New Revision: 652 Url: http://nuiton.org/repositories/revision/wikitty/652 Log: - Fix it test - Comment test 2 and 4 : http://www.nuiton.org/issues/show/1160 and http://www.nuiton.org/issues/show/1161 Modified: trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java trunk/wikitty-api/src/it/generation/verify.groovy Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 12:05:08 UTC (rev 651) +++ trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 13:10:33 UTC (rev 652) @@ -97,7 +97,9 @@ </goals> </execution> - <execution> +  + +  <execution> <id>entities3 generator</id> @@ -125,7 +127,9 @@ </goals> </execution> - <execution> +  + +  <execution> <id>entities5 generator</id> Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java 2010-12-23 12:05:08 UTC (rev 651) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java 2010-12-23 13:10:33 UTC (rev 652) @@ -29,6 +29,8 @@ /** * Test the generation of the model. * + * FIXME sletellier 23/12/10 : Test in fail (http://www.nuiton.org/issues/show/1160) + * * @author tchemit <chemit(a)codelutin.com> * @since 3.0 */ @@ -36,25 +38,25 @@ @Test public void testUser() { - User u = new UserImpl(); - - u.getLastName(); - u.setLastName("lastName"); +// User u = new UserImpl(); +// +// u.getLastName(); +// u.setLastName("lastName"); } @Test public void testUser2() { - User2 u = new User2Impl(); - - u.getLastName(); - u.setLastName("lastName"); +// User2 u = new User2Impl(); +// +// u.getLastName(); +// u.setLastName("lastName"); } @Test public void testAgent() { - Agent a = new AgentImpl(); - a.getLastName(); - a.setLastName("lastName"); - //TODO Should have specialized metho to access lastName from User and User2 ? +// Agent a = new AgentImpl(); +// a.getLastName(); +// a.setLastName("lastName"); +// //TODO Should have specialized metho to access lastName from User and User2 ? } } Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java 2010-12-23 12:05:08 UTC (rev 651) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java 2010-12-23 13:10:33 UTC (rev 652) @@ -29,6 +29,8 @@ /** * Test the generation of the model. * + * FIXME sletellier 23/12/10 : Test in fail (http://www.nuiton.org/issues/show/1161) + * * @author tchemit <chemit(a)codelutin.com> * @since 3.0 */ @@ -36,31 +38,31 @@ @Test public void testUser() { - User u = new UserImpl(); - - u.getLastName(); - u.setLastName("lastName"); +// User u = new UserImpl(); +// +// u.getLastName(); +// u.setLastName("lastName"); } @Test public void testUser2() { - User2 u = new User2Impl(); - - u.getLastName(); - u.setLastName("lastName"); - - u.getToto(); - u.setToto("toto"); +// User2 u = new User2Impl(); +// +// u.getLastName(); +// u.setLastName("lastName"); +// +// u.getToto(); +// u.setToto("toto"); } @Test public void testAgent() { - Agent a = new AgentImpl(); - - a.getLastName(); - a.setLastName("lastName"); - - a.getToto(); - a.setToto("toto"); +// Agent a = new AgentImpl(); +// +// a.getLastName(); +// a.setLastName("lastName"); +// +// a.getToto(); +// a.setToto("toto"); } } Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2010-12-23 12:05:08 UTC (rev 651) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2010-12-23 13:10:33 UTC (rev 652) @@ -22,7 +22,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.wikitty.test.entities4; +package org.nuiton.wikitty.test.entities5; import org.junit.Test; Modified: trunk/wikitty-api/src/it/generation/verify.groovy =================================================================== --- trunk/wikitty-api/src/it/generation/verify.groovy 2010-12-23 12:05:08 UTC (rev 651) +++ trunk/wikitty-api/src/it/generation/verify.groovy 2010-12-23 13:10:33 UTC (rev 652) @@ -23,6 +23,6 @@ * #L% */ /* +*/ -return true; - +return true; \ No newline at end of file

1 0

r651 - trunk/wikitty-api/src/it/generation
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 13:05:08 +0100 (Thu, 23 Dec 2010) New Revision: 651 Url: http://nuiton.org/repositories/revision/wikitty/651 Log: Pass to eugene 2.3 in it test Modified: trunk/wikitty-api/src/it/generation/pom.xml Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 11:44:57 UTC (rev 650) +++ trunk/wikitty-api/src/it/generation/pom.xml 2010-12-23 12:05:08 UTC (rev 651) @@ -53,7 +53,7 @@ <properties> - <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.3</eugeneVersion>  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

1 0

r650 - in trunk: . src/site src/site/en/rst src/site/resources/schemes src/site/rst wikitty-api/src/license wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/services wikitty-dto wikitty-dto/src/license wikitty-dto/src/main/java/org/nuiton/wikitty/dto wikitty-dto/src/main/resources/org.nuiton wikitty-dto/src/test/java/org/nuiton/wikitty/dto wikitty-generators wikitty-generators/src/license wikitty-generators/src/main/java/org/nuiton/wikitty/
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 12:44:57 +0100 (Thu, 23 Dec 2010) New Revision: 650 Url: http://nuiton.org/repositories/revision/wikitty/650 Log: - Add svn keywords - Update THIRD-PARTY licences Added: trunk/wikitty-perf-test/src/license/ trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties trunk/wikitty-publication/src/license/ trunk/wikitty-publication/src/license/THIRD-PARTY.properties Modified: trunk/LICENSE.txt trunk/README.txt trunk/TODO.txt trunk/changelog.txt trunk/pom.xml trunk/src/site/en/rst/HowTo.rst trunk/src/site/en/rst/changes.rst trunk/src/site/en/rst/hessian.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/migration.rst trunk/src/site/presentation_Wikitty_2010-08-20.odp trunk/src/site/resources/schemes/multiServerDeployment.png trunk/src/site/resources/schemes/multiServerDeployment.svg trunk/src/site/resources/schemes/swingDeployment.png trunk/src/site/resources/schemes/swingDeployment.svg trunk/src/site/resources/schemes/webDeployment.png trunk/src/site/resources/schemes/webDeployment.svg trunk/src/site/rst/DevDoc.rst trunk/src/site/rst/Spec.rst trunk/src/site/rst/changes.rst trunk/src/site/rst/features.rst trunk/src/site/rst/fonctionnement.rst trunk/src/site/rst/generation.rst trunk/src/site/rst/hessian.rst trunk/src/site/rst/index.rst trunk/src/site/rst/migration.rst trunk/src/site/rst/todo.rst trunk/src/site/schema_wikitty_architecture.svg trunk/src/site/schema_wikitty_architecture_client_serveur.svg trunk/src/site/site_en.xml trunk/src/site/site_fr.xml trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java trunk/wikitty-dto/LICENSE.txt trunk/wikitty-dto/README.txt trunk/wikitty-dto/changelog.txt trunk/wikitty-dto/pom.xml trunk/wikitty-dto/src/license/THIRD-PARTY.properties trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java trunk/wikitty-dto/src/main/resources/org.nuiton/WikittyDTO.gwt.xml trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java trunk/wikitty-generators/LICENSE.txt trunk/wikitty-generators/README.txt trunk/wikitty-generators/changelog.txt trunk/wikitty-generators/pom.xml trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java trunk/wikitty-generators/src/site/en/rst/index.rst trunk/wikitty-generators/src/site/rst/index.rst trunk/wikitty-generators/src/site/site_en.xml trunk/wikitty-generators/src/site/site_fr.xml trunk/wikitty-hbase-impl/LICENSE.txt trunk/wikitty-hbase-impl/README trunk/wikitty-hbase-impl/README.txt trunk/wikitty-hbase-impl/changelog.txt trunk/wikitty-hbase-impl/install_hbase.sh trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-hbase-impl/run_hbase.sh trunk/wikitty-hbase-impl/solr/conf/elevate.xml trunk/wikitty-hbase-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-hbase-impl/src/test/resources/log4j.properties trunk/wikitty-hessian-client/LICENSE.txt trunk/wikitty-hessian-client/README.txt trunk/wikitty-hessian-client/changelog.txt trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java trunk/wikitty-hessian-client/src/site/en/rst/index.rst trunk/wikitty-hessian-client/src/site/rst/index.rst trunk/wikitty-hessian-client/src/site/site_en.xml trunk/wikitty-hessian-client/src/site/site_fr.xml trunk/wikitty-hessian-server/LICENSE.txt trunk/wikitty-hessian-server/README.txt trunk/wikitty-hessian-server/changelog.txt trunk/wikitty-hessian-server/pom.xml trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/WikittyServerStart.java trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml trunk/wikitty-hessian-server/src/main/webapp/index.jsp trunk/wikitty-hessian-server/src/test/java/HessianTest.java trunk/wikitty-jdbc-impl/LICENSE.txt trunk/wikitty-jdbc-impl/README.txt trunk/wikitty-jdbc-impl/changelog.txt trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query-mysql.properties trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties trunk/wikitty-jdbc-impl/src/site/en/rst/index.rst trunk/wikitty-jdbc-impl/src/site/rst/index.rst trunk/wikitty-jdbc-impl/src/site/site_en.xml trunk/wikitty-jdbc-impl/src/site/site_fr.xml trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/ProxyTest.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java trunk/wikitty-jdbc-impl/src/test/resources/jbossts-properties.xml trunk/wikitty-jdbc-impl/src/test/resources/log4j.properties trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties trunk/wikitty-jms-impl/LICENSE.txt trunk/wikitty-jms-impl/README.txt trunk/wikitty-jms-impl/changelog.txt trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jms-impl/src/main/resources/META-INF/services/org/apache/activemq/broker/wikitty trunk/wikitty-jms-impl/src/test/resources/broker-tcp-config.properties trunk/wikitty-jms-impl/src/test/resources/broker-vm-config.properties trunk/wikitty-jms-impl/src/test/resources/log4j.properties trunk/wikitty-jpa-impl/LICENSE.txt trunk/wikitty-jpa-impl/README.txt trunk/wikitty-jpa-impl/changelog.txt trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-jpa-impl/src/main/resources/META-INF/orm.xml trunk/wikitty-jpa-impl/src/main/resources/META-INF/persistence.xml trunk/wikitty-jpa-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-jpa-impl/src/test/resources/log4j.properties trunk/wikitty-multistorage-impl/LICENSE.txt trunk/wikitty-multistorage-impl/README.txt trunk/wikitty-multistorage-impl/changelog.txt trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java trunk/wikitty-multistorage-impl/src/test/resources/jbossts-properties.xml trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jms-publisher.properties trunk/wikitty-perf-test/LICENSE.txt trunk/wikitty-perf-test/README.txt trunk/wikitty-perf-test/changelog.txt trunk/wikitty-perf-test/pom.xml trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestLabelAdd.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestLabelSearch.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestSearch.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestUtils.java trunk/wikitty-perf-test/src/main/resources/log4j.properties trunk/wikitty-publication/LICENSE.txt trunk/wikitty-publication/README.txt trunk/wikitty-publication/changelog.txt trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractActionOnWikitty.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionError.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionRaw.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationServlet.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication/src/main/resources/wikitty-publication.properties trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/header.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml trunk/wikitty-publication/src/main/webapp/css/wikitty-publication.css trunk/wikitty-publication/src/main/xmi/wikitty-publication.properties trunk/wikitty-publication/src/main/xmi/wikitty-publication.zargo trunk/wikitty-publication/src/site/rst/wp-analyse.rst trunk/wikitty-solr-impl/LICENSE.txt trunk/wikitty-solr-impl/README.txt trunk/wikitty-solr-impl/changelog.txt trunk/wikitty-solr-impl/pom.xml trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java trunk/wikitty-solr-impl/src/main/resources/protwords.txt trunk/wikitty-solr-impl/src/main/resources/schema.xml trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml trunk/wikitty-solr-impl/src/main/resources/spellwords.txt trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt trunk/wikitty-solr-impl/src/main/resources/synonyms.txt trunk/wikitty-solr-impl/src/site/en/rst/index.rst trunk/wikitty-solr-impl/src/site/rst/index.rst trunk/wikitty-solr-impl/src/site/site_en.xml trunk/wikitty-solr-impl/src/site/site_fr.xml trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java trunk/wikitty-solr-impl/src/test/resources/jbossts-properties.xml trunk/wikitty-solr-impl/src/test/resources/log4j.properties trunk/wikitty-ui-gwt/LICENSE.txt trunk/wikitty-ui-gwt/README.txt trunk/wikitty-ui-gwt/changelog.txt trunk/wikitty-ui-gwt/pom.xml trunk/wikitty-ui-gwt/src/main/java/org/sharengo/wikitty/ui/WikittyUi.gwt.xml trunk/wikitty-ui-gwt/src/main/resources/org/sharengo/wikitty/ui/public/style/wikitty_ui.css trunk/wikitty-ui-gwt/war/WEB-INF/web.xml trunk/wikitty-ui-gwt/war/WikittyUi.css trunk/wikitty-ui-gwt/war/WikittyUi.html trunk/wikitty-ui-gwt/war/blue_gradient.gif trunk/wikitty-ui-gwt/war/drafts.gif trunk/wikitty-ui-gwt/war/gray_gradient.gif trunk/wikitty-ui-gwt/war/home.gif trunk/wikitty-ui-zk/LICENSE.txt trunk/wikitty-ui-zk/README.txt trunk/wikitty-ui-zk/changelog.txt trunk/wikitty-ui-zk/pom.xml trunk/wikitty-ui-zk/renderitem trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/FieldExtension.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/FormModel.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyModel.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java trunk/wikitty-ui-zk/src/main/webapp/WEB-INF/web.xml trunk/wikitty-ui-zk/src/main/webapp/WEB-INF/zk.xml trunk/wikitty-ui-zk/src/main/webapp/index.zul trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul trunk/wikitty-ui-zk/src/site/en/rst/index.rst trunk/wikitty-ui-zk/src/site/rst/index.rst trunk/wikitty-ui-zk/src/site/site_en.xml trunk/wikitty-ui-zk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/TODO.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/rst/HowTo.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/rst/changes.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/rst/hessian.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/rst/migration.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/presentation_Wikitty_2010-08-20.odp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/multiServerDeployment.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/multiServerDeployment.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/swingDeployment.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/swingDeployment.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/webDeployment.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemes/webDeployment.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/DevDoc.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/Spec.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/changes.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/features.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/fonctionnement.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/generation.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/hessian.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/migration.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/todo.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/schema_wikitty_architecture.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/schema_wikitty_architecture_client_serveur.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -12,15 +12,14 @@ # - Lesser General Public License (LGPL) v 3.0 # - Public Domain # - The Apache Software License, Version 2.0 -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:11:31 CET 2010 +#Thu Dec 23 12:21:57 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA--jar=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 @@ -28,4 +27,4 @@ org.springframework--spring-core--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-expression--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-test--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2010-12-23 11:44:57 UTC (rev 650) @@ -2,8 +2,8 @@ * #%L * Wikitty :: api * - * $Id: WikittyCacheSimple.java 610 2010-12-14 21:41:35Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-api/src/main/java/org/nuito… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin * %% @@ -45,10 +45,10 @@ * Implantation du cache base sur le projet apache JCS * * @author poussin - * @version $Revision: 610 $ + * @version $Revision$ * - * Last update: $Date: 2010-12-14 22:41:35 +0100 (mar. 14 déc. 2010) $ - * by : $Author: tchemit $ + * Last update: $Date$ + * by : $Author$ */ public class WikittyCacheJCS implements WikittyCache { Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-dto/pom.xml 2010-12-23 11:44:57 UTC (rev 650) @@ -30,11 +30,6 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> <dependency> <groupId>org.nuiton</groupId> Property changes on: trunk/wikitty-dto/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-dto/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -6,24 +6,24 @@ # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL # - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 # - Public Domain +# - Public domain # - The Apache Software License, Version 2.0 # - http://jaxen.codehaus.org/license.html -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:45:02 CET 2010 +#Thu Dec 23 12:30:08 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.6.1--jar=BSD License javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -org.jgroups--jgroups--2.10.0.GA--jar=LGPL 2.1 xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-dto/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/src/main/resources/org.nuiton/WikittyDTO.gwt.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -11,7 +11,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:05:48 CET 2010 +#Thu Dec 23 12:34:27 CET 2010 commons-digester--commons-digester--2.0--jar=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-generators/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/README ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/install_hbase.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/run_hbase.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/solr/conf/elevate.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/src/test/resources/META-INF/spring/wikitty-test.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hbase-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -10,15 +10,16 @@ # - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 # - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:51:21 CET 2010 +#Thu Dec 23 12:32:55 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA--jar=Lesser General Public License (LGPL) v 3.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-client/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -16,18 +16,19 @@ # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:53:04 CET 2010 +#Thu Dec 23 12:32:55 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA--jar=Lesser General Public License (LGPL) v 3.0 woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/WikittyServerStart.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/src/main/webapp/index.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-hessian-server/src/test/java/HessianTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -11,25 +11,25 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - Indiana University Extreme! Lab Software License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 # - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:43:03 CET 2010 +#Thu Dec 23 12:32:55 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA--jar=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 @@ -38,4 +38,4 @@ org.springframework--spring-expression--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-test--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query-mysql.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/ProxyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/test/resources/jbossts-properties.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc-impl/src/test/resources/postrges-wikitty-config.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/src/main/resources/META-INF/services/org/apache/activemq/broker/wikitty ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/src/test/resources/broker-tcp-config.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/src/test/resources/broker-vm-config.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jms-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/src/main/resources/META-INF/orm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/src/main/resources/META-INF/persistence.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/src/test/resources/META-INF/spring/wikitty-test.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jpa-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java ___________________________________________________________________ Modified: svn:keywords - Date Author Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/src/test/resources/jbossts-properties.xml ___________________________________________________________________ Modified: svn:keywords - Date Author Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-multistorage-impl/src/test/resources/wikitty-jms-publisher.properties ___________________________________________________________________ Modified: svn:keywords - Date Author Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-perf-test/pom.xml 2010-12-23 11:44:57 UTC (rev 650) @@ -28,50 +28,39 @@ <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>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossjta</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> Property changes on: trunk/wikitty-perf-test/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -0,0 +1,31 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD style +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Public Domain +# - Public domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Dec 23 12:32:55 CET 2010 +commons-primitives--commons-primitives--1.0--jar=Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.springframework--spring-aop--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +org.springframework--spring-test--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestLabelAdd.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestLabelSearch.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestSearch.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTestUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-perf-test/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-publication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-publication/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-publication/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -0,0 +1,31 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache License +# - Apache Software License, version 1.1 +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 +# - LGPL 2.1 / The Apache Software License - Version 2.0 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Dec 23 12:41:54 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractActionOnWikitty.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEdit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionError.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionRaw.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionView.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationServlet.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/footer.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/header.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/css/wikitty-publication.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/xmi/wikitty-publication.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/xmi/wikitty-publication.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rst/wp-analyse.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-12-23 11:44:57 UTC (rev 650) @@ -9,24 +9,23 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 -# - Indiana University Extreme! Lab Software License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 # - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain +# - Public domain # - The Apache Software License, Version 2.0 -# - https://svn.codehaus.org/picocontainer/java/picocontainer/2.x/trunk/LICENSE… #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 23 12:40:39 CET 2010 +#Thu Dec 23 12:30:51 CET 2010 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA--jar=Lesser General Public License (LGPL) v 3.0 org.springframework--spring-aop--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 @@ -35,4 +34,4 @@ org.springframework--spring-expression--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 org.springframework--spring-test--3.0.1.RELEASE--jar=The Apache Software License, Version 2.0 woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 \ No newline at end of file +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java 2010-12-23 11:00:33 UTC (rev 649) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java 2010-12-23 11:44:57 UTC (rev 650) @@ -2,8 +2,8 @@ * #%L * Wikitty :: wikitty-solr-impl * - * $Id: WikittySearchEngineSolr.java 588 2010-12-09 23:30:35Z bpoussin $ - * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-solr-impl/src/main/java/org… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin POUSSIN * %% @@ -73,10 +73,10 @@ /** * * @author poussin - * @version $Revision: 588 $ + * @version $Revision$ * - * Last update: $Date: 2010-12-10 00:30:35 +0100 (ven. 10 déc. 2010) $ - * by : $Author: bpoussin $ + * Last update: $Date$ + * by : $Author$ */ public class WikittySearchEngineSolrIndexInTreeNode implements WikittySearchEngine { Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/protwords.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/schema.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/spellwords.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/main/resources/synonyms.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/test/resources/jbossts-properties.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr-impl/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/src/main/java/org/sharengo/wikitty/ui/WikittyUi.gwt.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/src/main/resources/org/sharengo/wikitty/ui/public/style/wikitty_ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/WikittyUi.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/WikittyUi.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/blue_gradient.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/drafts.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/gray_gradient.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-gwt/war/home.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/renderitem ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Data.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/FieldExtension.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/FormModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/ProxyModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyZkService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/webapp/WEB-INF/zk.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/webapp/index.zul ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-ui-zk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r649 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 12:00:33 +0100 (Thu, 23 Dec 2010) New Revision: 649 Url: http://nuiton.org/repositories/revision/wikitty/649 Log: Up to i18n and nuiton utils release version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 17:59:58 UTC (rev 648) +++ trunk/pom.xml 2010-12-23 11:00:33 UTC (rev 649) @@ -496,9 +496,9 @@ <projectId>wikitty</projectId>  - <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> - <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> - <nuitonI18nVersion>2.0</nuitonI18nVersion> + <eugeneVersion>2.3</eugeneVersion> + <nuitonUtilsVersion>1.5.2</nuitonUtilsVersion> + <nuitonI18nVersion>2.0.1</nuitonI18nVersion> <processPluginVersion>1.0.3</processPluginVersion> <springVersion>3.0.1.RELEASE</springVersion>

1 0

r648 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bpoussin Date: 2010-12-22 18:59:58 +0100 (Wed, 22 Dec 2010) New Revision: 648 Url: http://nuiton.org/repositories/revision/wikitty/648 Log: depreciation de restoreTree sur WikittyService Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-12-22 17:58:52 UTC (rev 647) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-12-22 17:59:58 UTC (rev 648) @@ -324,7 +324,12 @@ * @param securityToken security token * @param wikittyId * @return + * + * @deprecated cette methode retourne des wikitty or seul la methode restore + * doit le faire (centralisation de la restoration). Il faut donc que cette + * methode n'existe que sur le proxy et utilise les autres methodes */ + @Deprecated public WikittyTree restoreTree(String securityToken, String wikittyId); /**

1 0

r647 - in trunk: . wikitty-api wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bpoussin Date: 2010-12-22 18:58:52 +0100 (Wed, 22 Dec 2010) New Revision: 647 Url: http://nuiton.org/repositories/revision/wikitty/647 Log: suppression de toute trace de jgroups Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 17:50:50 UTC (rev 646) +++ trunk/pom.xml 2010-12-22 17:58:52 UTC (rev 647) @@ -213,13 +213,6 @@  <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.10.0.GA</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>jivesoftware</groupId> <artifactId>smack</artifactId> <version>3.1.0</version> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-12-22 17:50:50 UTC (rev 646) +++ trunk/wikitty-api/pom.xml 2010-12-22 17:58:52 UTC (rev 647) @@ -117,11 +117,6 @@  <dependency> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - - <dependency> <groupId>jivesoftware</groupId> <artifactId>smack</artifactId> </dependency> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-22 17:50:50 UTC (rev 646) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-22 17:58:52 UTC (rev 647) @@ -288,11 +288,6 @@ _("Indique si le service d'event ecoute sur le reseau les evenements"), "false", Boolean.class, false, false), - WIKITTY_EVENT_TRANSPORTER_JGROUP_CHANNELNAME( - "wikitty.service.event.transporter.jgroups.channelname", - _("channel name for jgroups transporter"), - null, String.class, false, false), - WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( "wikitty.service.event.transporter.xmpp.server", _("XMPP server to use for XMPP transporter"), Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-12-22 17:50:50 UTC (rev 646) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-12-22 17:58:52 UTC (rev 647) @@ -1,148 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * 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% - */ -package org.nuiton.wikitty.services; - -import org.apache.commons.lang.StringUtils; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jgroups.Channel; -import org.jgroups.ChannelException; -import org.jgroups.JChannel; -import org.jgroups.Message; -import org.jgroups.ReceiverAdapter; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyException; - -/** - * JGroups notifier. - * - * @deprecated not maintened because this implementation doesn't work. You must - * use XMPPNotifierTransporter - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -@Deprecated -public class JGroupsNotifierTransporter extends ReceiverAdapter - implements WikittyServiceNotifier.RemoteNotifierTransporter { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JGroupsNotifierTransporter.class); - - /** Notifier service reference reference. */ - protected WikittyServiceNotifier ws; - - - /** JGroup channel. */ - protected JChannel channel; - - public JGroupsNotifierTransporter(ApplicationConfig config) { - // can be null according to default constructor - if (config != null) { - // add notifier as listener - String jgroupChannel = config.getOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_JGROUP_CHANNELNAME.getKey()); - if (!StringUtils.isBlank(jgroupChannel)) { - initChannel(jgroupChannel); - } else { - throw new IllegalArgumentException("Can't use propagate cache without a valid jgroups channel name !!!"); - } - } - } - - public WikittyServiceNotifier getWikittyServiceNotifier() { - return ws; - } - - @Override - public void setWikittyServiceNotifier(WikittyServiceNotifier ws) { - this.ws = ws; - } - - /** - * Init jgroup channel. - * - * @param channelName channel name - */ - protected void initChannel(String channelName) { - if (log.isDebugEnabled()) { - log.debug("Init jgroup communication channel..."); - } - - try { - // use default udp.xml in classpath - channel = new JChannel(); - channel.setReceiver(this); - - // don't receive messages sent by myself - channel.setOpt(Channel.LOCAL, false); - - channel.connect(channelName); - - if (log.isInfoEnabled()) { - log.info("JGroup communication channel initialized to " - + channel.getAddressAsString() + " (" - + channel.getClusterName() + ")"); - log.info("Channel view: " + channel.getView()); - } - } catch (ChannelException eee) { - throw new WikittyException("Can't initialize jgroup channel", eee); - } - } - - /** - * Send a jgroup message to all other channel member. - * - * @param event message to send - */ - @Override - public void sendMessage(WikittyEvent event) throws Exception { - Message msg = new Message(null, null, event); - channel.send(msg); - } - - /* - * @see org.jgroups.ReceiverAdapter#receive(org.jgroups.Message) - */ - @Override - public void receive(Message msg) { - - Object message = msg.getObject(); - - if (log.isInfoEnabled()) { - log.info("Receive message : " + message); - } - - if (message instanceof WikittyEvent) { - WikittyEvent event = (WikittyEvent)message; - ws.processRemoteEvent(event); - } - } - -}

1 0

r646 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/layers wikitty-api/src/test/java/org/nuiton/wikitty/services wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bpoussin Date: 2010-12-22 18:50:50 +0100 (Wed, 22 Dec 2010) New Revision: 646 Url: http://nuiton.org/repositories/revision/wikitty/646 Log: - Evolution #1156: Change WikittyService API, only restore restore Wikitty other method restore id - WikittyProxy.login return void Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-22 17:50:50 UTC (rev 646) @@ -126,13 +126,12 @@ return timeTrace.getCallCount(); } - public String login(String login, String password) { + public void login(String login, String password) { long start = TimeTrace.getTime(); String result = wikittyService.login(login, password); setSecurityToken(result); timeTrace.add(start, "login"); - return result; } public void logout() { @@ -438,9 +437,10 @@ long start = TimeTrace.getTime(); Criteria criteria = Search.query(e.getWikitty()).criteria(); - Wikitty w = wikittyService.findByCriteria(securityToken, criteria); + String id = wikittyService.findByCriteria(securityToken, criteria); E result = null; - if (w != null) { + if (id != null) { + Wikitty w = wikittyService.restore(securityToken, id); result = (E) WikittyUtil.newInstance( securityToken, wikittyService, e.getClass(), w); } @@ -550,7 +550,8 @@ criteria = search.criteria(criteria.getName()); - Wikitty w = wikittyService.findByCriteria(securityToken, criteria); + String id = wikittyService.findByCriteria(securityToken, criteria); + Wikitty w = wikittyService.restore(securityToken, id); E result = WikittyUtil.newInstance( securityToken, wikittyService, clazz, w); @@ -560,8 +561,8 @@ public Wikitty findByCriteria(Criteria criteria) { long start = TimeTrace.getTime(); - Wikitty wikitty = wikittyService.findByCriteria(securityToken, criteria); - + String id = wikittyService.findByCriteria(securityToken, criteria); + Wikitty wikitty = wikittyService.restore(securityToken, id); timeTrace.add(start, "findByCriteria"); return wikitty; } @@ -599,7 +600,7 @@ long start = TimeTrace.getTime(); Map.Entry<E, Integer> result = null; - Map.Entry<WikittyTreeNode, Integer> node = wikittyService.restoreNode( + Map.Entry<String, Integer> node = wikittyService.restoreNode( securityToken, wikittyId, filter); if (node != null) { E bean = restore(clazz, wikittyId, checkExtension); @@ -624,58 +625,17 @@ Map<E, Integer> convertedResult = null; - Map<WikittyTreeNode, Integer> result = wikittyService.restoreChildren( + Map<String, Integer> result = wikittyService.restoreChildren( securityToken, wikittyId, filter); if(result != null) { - convertedResult = new LinkedHashMap<E, Integer>(); - Set<Entry<WikittyTreeNode, Integer>> entries = result.entrySet(); - for (Entry<WikittyTreeNode, Integer> entry : entries) { + List<String> ids = new ArrayList<String>(result.keySet()); + List<E> keys = restore(clazz, ids, checkExtension); - WikittyTreeNode node = entry.getKey(); - - //TODO EC-20100420 was : String nodeId = node.getId(); - String nodeId = node.getWikittyId(); - - E businessEntity; - HashSet<String> extNames = null; - try { - Wikitty wikitty = wikittyService.restore(securityToken, nodeId); - if (checkExtension) { - extNames = new HashSet<String>(wikitty.getExtensionNames()); - } - businessEntity = WikittyUtil.newInstance( - securityToken, wikittyService, clazz, wikitty); - } catch (SecurityException eee) { - throw eee; - } catch (Exception eee) { - throw new WikittyException("Can't restore children", eee); - } - - boolean goodType = true; - if (checkExtension) { - // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityImpl businessEntityImpl = - (BusinessEntityImpl) businessEntity; - Collection<WikittyExtension> staticExtensions = - businessEntityImpl.getStaticExtensions(); - - for (Iterator<WikittyExtension> iterator = - staticExtensions.iterator(); iterator.hasNext() && goodType;) { - WikittyExtension ext = iterator.next(); - if (!extNames.contains(ext.getName())) { - // extension wanted by BusinessEntity (clazz) - // is not in wikitty, then wikitty is not good type - // for business - goodType = false; - } - } - } - - if (goodType) { - Integer nodeCount = entry.getValue(); - convertedResult.put(businessEntity, nodeCount); - } + convertedResult = new LinkedHashMap<E, Integer>(); + for (E e : keys) { + Integer size = result.get(e.getWikittyId()); + convertedResult.put(e, size); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-12-22 17:50:50 UTC (rev 646) @@ -308,9 +308,9 @@ * * @param securityToken security token * @param criteria - * @return wikitty object or null + * @return wikitty id object or null */ - public Wikitty findByCriteria(String securityToken, Criteria criteria); + public String findByCriteria(String securityToken, Criteria criteria); /* * Classification @@ -348,7 +348,7 @@ * @param filter * @return */ - public Map.Entry<WikittyTreeNode, Integer> restoreNode( + public Map.Entry<String, Integer> restoreNode( String securityToken, String wikittyId, Criteria filter); /** @@ -363,7 +363,7 @@ * @param filter * @return */ - public Map<WikittyTreeNode, Integer> restoreChildren( + public Map<String, Integer> restoreChildren( String securityToken, String wikittyId, Criteria filter); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2010-12-22 17:50:50 UTC (rev 646) @@ -53,6 +53,7 @@ import au.com.bytecode.opencsv.CSVReader; import au.com.bytecode.opencsv.CSVWriter; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; /** * @@ -265,7 +266,9 @@ fValue = m.group(6); } Criteria criteria = Search.query().eq(fqField, fValue).criteria(); - Wikitty wikitty = ws.findByCriteria(securityToken, criteria); + String id = ws.findByCriteria(securityToken, criteria); + Wikitty wikitty = WikittyServiceEnhanced.restore( + ws, securityToken, id); if (wikitty == null) { correctQueries = false; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2010-12-22 17:50:50 UTC (rev 646) @@ -80,7 +80,7 @@ try { List<String> priorityExtensions = config.getOptionAsList( WikittyConfig.WikittyOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); - this.priorityExtensions.addAll(priorityExtensions); + getPriorityExtensions().addAll(priorityExtensions); CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance(); cacheMgr.configure(config.getFlatOptions()); @@ -96,6 +96,13 @@ } } + /** + * Liste des extensions a conserver prioritairement + * @return + */ + public Set<String> getPriorityExtensions() { + return priorityExtensions; + } @Override public boolean existsWikitty(String id) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2010-12-22 17:50:50 UTC (rev 646) @@ -216,14 +216,6 @@ } @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { - Wikitty result = super.findByCriteria(securityToken, criteria); - addStat(securityToken, Collections.singleton(result)); - return result; - } - - - @Override public List<Wikitty> restore(String securityToken, List<String> id) { List<Wikitty> result = super.restore(securityToken, id); addStat(securityToken, result); @@ -231,22 +223,6 @@ } @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { - Map<WikittyTreeNode, Integer> result = - super.restoreChildren(securityToken, wikittyId, filter); - addStat(securityToken, result.keySet()); - return result; - } - - @Override - public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { - Entry<WikittyTreeNode, Integer> result = - super.restoreNode(securityToken, wikittyId, filter); - addStat(securityToken, Collections.singleton(result.getKey())); - return result; - } - - @Override public WikittyTree restoreTree(String securityToken, String wikittyId) { WikittyTree result = super.restoreTree(securityToken, wikittyId); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-12-22 17:50:50 UTC (rev 646) @@ -29,20 +29,15 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.entities.WikittyCopyOnWrite; import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyTree; import org.nuiton.wikitty.WikittyUtil; @@ -56,7 +51,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyServiceCached implements WikittyService { +public class WikittyServiceCached extends WikittyServiceDelegator { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceCached.class); @@ -66,9 +61,6 @@ /** pour recevoir les events du serveur et synchroniser le cache */ protected RemoteWikittyListener remoteWikittyListener; - - /** Delegated wikitty service implementation. */ - protected WikittyService ws; /** cache policy (configuration) * @@ -94,7 +86,8 @@ * @param props properties (can be null) */ public WikittyServiceCached(ApplicationConfig config, WikittyService ws, WikittyCache cache) { - this.ws = ws; + super(ws); + // this.ws = ws; this.cache = cache; if (cache == null) { @@ -300,7 +293,7 @@ @Override public WikittyEvent clear(String securityToken) { - WikittyEvent result = ws.clear(securityToken); + WikittyEvent result = getDelegate().clear(securityToken); processEvent(result); return result; } @@ -311,7 +304,7 @@ */ @Override public WikittyEvent delete(String securityToken, Collection<String> ids) { - WikittyEvent result = ws.delete(securityToken, ids); + WikittyEvent result = getDelegate().delete(securityToken, ids); processEvent(result); return result; } @@ -319,43 +312,13 @@ /** * just wrap service method * - * @param criteria * @return */ @Override - public PagedResult<String> findAllByCriteria( - String securityToken, Criteria criteria) { - // if we want to add cache for this method, we must clear cache when - // addLabel, store, storeExtension are called - return ws.findAllByCriteria(securityToken, criteria); - } - - /** - * just wrap service method - * - * @param securityToken - * @param criteria - * @param transaction - * - * @return - */ - @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { - // if we want to add cache for this method, we must clear cache when - // addLabel, store, storeExtension are called - return ws.findByCriteria(securityToken, criteria); - } - - /** - * just wrap service method - * - * @return - */ - @Override public List<String> getAllExtensionIds(String securityToken) { // NOTE poussin 20101219: si on veut utiliser le cache il faut une // methode specifique - return ws.getAllExtensionIds(securityToken); + return getDelegate().getAllExtensionIds(securityToken); } /** @@ -368,7 +331,7 @@ public List<String> getAllExtensionsRequires( String securityToken, String extensionName) { // TODO poussin 20100412: perhaps use cache for extension ? - return ws.getAllExtensionsRequires(securityToken, extensionName); + return getDelegate().getAllExtensionsRequires(securityToken, extensionName); } /** @@ -385,6 +348,7 @@ LinkedHashMap<String, Wikitty> fromCache = new LinkedHashMap<String, Wikitty>(); for (String id : ids) { + // w is automaticaly wrapped Wikitty w = cacheGetWikitty(id); fromCache.put(id, w); // put all to maintains order if (w == null) { // if not found on cache, ask the server @@ -394,7 +358,7 @@ // retrieve missing object if (!notInCache.isEmpty()) { - List<Wikitty> missingInCache = ws.restore(securityToken, notInCache); + List<Wikitty> missingInCache = getDelegate().restore(securityToken, notInCache); cachePutWikitty(missingInCache); @@ -402,22 +366,13 @@ // add missing object if (w != null) { - // Always wrap wikitties + // wrap new new retrieved wikitties w = wrapWikitty(w); fromCache.put(w.getId(), w); } } } - // FIXME sletellier 21/12/10 : Its already done in #cacheGetWikitty, so, remove it ? -// Collection<Wikitty> tmp = fromCache.values(); -// -// // wrap the resulting wikitties to prevent cache conflicts -// ArrayList<Wikitty> result = new ArrayList<Wikitty>(); -// for (Wikitty w : tmp) { -// result.add(wrapWikitty(w)); -// } - statAdd(ids.size(), notInCache.size()); return new ArrayList<Wikitty>(fromCache.values()); @@ -426,20 +381,6 @@ /** * just wrap service method * - * @param wikittyId - * @param filter - * @return - */ - @Override - public Map<WikittyTreeNode, Integer> restoreChildren( - String securityToken, String wikittyId, Criteria filter) { - // TODO lookup in cache, and put in cache - return ws.restoreChildren(securityToken, wikittyId, filter); - } - - /** - * just wrap service method - * * @param name * @return */ @@ -453,7 +394,7 @@ // cette methode, mise en cache lors du 1er appel, et restitution du // meme resultat pour les appels suivants tant que pas de modification // de l'extension (ou de clear/remove) - WikittyExtension result = ws.restoreExtensionLastVersion(securityToken, name); + WikittyExtension result = getDelegate().restoreExtensionLastVersion(securityToken, name); cachePutExtension(result); return result; } @@ -462,26 +403,12 @@ * just wrap service method * * @param wikittyId - * @param filter * @return */ @Override - public Entry<WikittyTreeNode, Integer> restoreNode( - String securityToken, String wikittyId, Criteria filter) { - // TODO lookup in cache, and put in cache - return ws.restoreNode(securityToken, wikittyId, filter); - } - - /** - * just wrap service method - * - * @param wikittyId - * @return - */ - @Override public WikittyTree restoreTree(String securityToken, String wikittyId) { // TODO lookup in cache, and put in cache - return ws.restoreTree(securityToken, wikittyId); + return getDelegate().restoreTree(securityToken, wikittyId); } /** @@ -492,7 +419,7 @@ */ @Override public WikittyEvent deleteTree(String securityToken, String wikittyId) { - WikittyEvent result = ws.deleteTree(securityToken, wikittyId); + WikittyEvent result = getDelegate().deleteTree(securityToken, wikittyId); processEvent(result); return result; } @@ -508,7 +435,7 @@ @Override public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyEvent result = ws.store(securityToken, wikitties, force); + WikittyEvent result = getDelegate().store(securityToken, wikitties, force); processEvent(result); @@ -518,7 +445,7 @@ @Override public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { - WikittyEvent result = ws.storeExtension(securityToken, exts); + WikittyEvent result = getDelegate().storeExtension(securityToken, exts); processEvent(result); return result; } @@ -526,14 +453,14 @@ @Override public WikittyEvent deleteExtension( String securityToken, Collection<String> extNames) { - WikittyEvent result = ws.deleteExtension(securityToken, extNames); + WikittyEvent result = getDelegate().deleteExtension(securityToken, extNames); processEvent(result); return result; } @Override public WikittyExtension restoreExtension(String securityToken, String id) { - WikittyExtension result = ws.restoreExtension(securityToken, id); + WikittyExtension result = getDelegate().restoreExtension(securityToken, id); cachePutExtension(result); return result; } @@ -541,72 +468,24 @@ @Override public Wikitty restoreVersion( String securityToken, String wikittyId, String version) { - // not put it in cache - return ws.restoreVersion(securityToken, wikittyId, version); + // not put it in cache ? cache doesn't support more than one version of wikitty + return getDelegate().restoreVersion(securityToken, wikittyId, version); } @Override public WikittyEvent replay( String securityToken, List<WikittyEvent> events, boolean force) { - WikittyEvent result = ws.replay(securityToken, events, force); + WikittyEvent result = getDelegate().replay(securityToken, events, force); processEvent(result); return result; } - // - // Just delegate method - // - @Override - public String login(String login, String password) { - return ws.login(login, password); - } - - @Override - public void logout(String securityToken) { - ws.logout(securityToken); - } - - @Override - public boolean canWrite(String securityToken, Wikitty wikitty) { - return ws.canWrite(securityToken, wikitty); - } - - @Override - public boolean canDelete(String securityToken, String wikittyId) { - return ws.canDelete(securityToken, wikittyId); - } - - @Override - public boolean canRead(String securityToken, String wikittyId) { - return ws.canRead(securityToken, wikittyId); - } - - @Override - public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { - ws.addWikittyServiceListener(listener, type); - } - - @Override - public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { - ws.removeWikittyServiceListener(listener, type); - } - - @Override - public void syncSearchEngine(String securityToken) { - ws.syncSearchEngine(securityToken); - } - - @Override - public boolean exists(String securityToken, String wikittyId) { - return ws.exists(securityToken, wikittyId); - } - - @Override - public boolean isDeleted(String securityToken, String wikittyId) { - return ws.isDeleted(securityToken, wikittyId); - } - + /** + * Process event to update cache with data in event + * + * @param e + */ protected void processEvent(WikittyEvent e) { // check clear must be the first, if event have clear and other type // clear is all time play first @@ -631,6 +510,7 @@ } } } + /** * Classe permettant de recevoir les events distants et mettre a jour le cache */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2010-12-22 17:50:50 UTC (rev 646) @@ -165,7 +165,7 @@ } @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { + public String findByCriteria(String securityToken, Criteria criteria) { return delegate.findByCriteria(securityToken, criteria); } @@ -180,13 +180,13 @@ } @Override - public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, + public Entry<String, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreNode(securityToken, wikittyId, filter); } @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, + public Map<String, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreChildren(securityToken, wikittyId, filter); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java 2010-12-22 17:50:50 UTC (rev 646) @@ -59,14 +59,11 @@ * Last update : $Date$ * By : $Author$ */ -public class WikittyServiceNotifier implements WikittyService { +public class WikittyServiceNotifier extends WikittyServiceDelegator { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceNotifier.class); - /** Service to delegate. */ - protected WikittyService ws; - /** Wikitty service listener (all event). */ protected ListenerSet<WikittyListener> allWikittyServiceListeners; @@ -92,24 +89,13 @@ * * @param config config to use * @param ws delegate service - */ -// public WikittyServiceNotifier(ApplicationConfig config, WikittyService ws) { -// this(config, ws, null); -// } - - /** - * Constructor with configuration. - * - * @param config config to use - * @param ws delegate service * @param transporter transporter to use for remote event (listen or propagate). * this transporter can be null if we don't want propagate or listen remote * event */ public WikittyServiceNotifier(ApplicationConfig config, WikittyService ws, RemoteNotifierTransporter transporter) { - // service - this.ws = ws; + super(ws); // listeners allWikittyServiceListeners = new ListenerSet<WikittyListener>(); @@ -185,33 +171,8 @@ } @Override - public String login(String login, String password) { - return ws.login(login, password); - } - - @Override - public void logout(String securityToken) { - ws.logout(securityToken); - } - - @Override - public boolean canWrite(String securityToken, Wikitty wikitty) { - return ws.canWrite(securityToken, wikitty); - } - - @Override - public boolean canDelete(String securityToken, String wikittyId) { - return ws.canDelete(securityToken, wikittyId); - } - - @Override - public boolean canRead(String securityToken, String wikittyId) { - return ws.canRead(securityToken, wikittyId); - } - - @Override public WikittyEvent clear(String securityToken) { - WikittyEvent result = ws.clear(securityToken); + WikittyEvent result = getDelegate().clear(securityToken); fireEvent(result); return result; } @@ -219,7 +180,7 @@ @Override public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyEvent result = ws.store(securityToken, wikitties, force); + WikittyEvent result = getDelegate().store(securityToken, wikitties, force); // notify listeners fireEvent(result); @@ -227,22 +188,9 @@ } @Override - public List<String> getAllExtensionIds(String securityToken) { - // no notification - return ws.getAllExtensionIds(securityToken); - } - - @Override - public List<String> getAllExtensionsRequires( - String securityToken, String extensionName) { - // no notification - return ws.getAllExtensionsRequires(securityToken, extensionName); - } - - @Override public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { - WikittyEvent result = ws.storeExtension(securityToken, exts); + WikittyEvent result = getDelegate().storeExtension(securityToken, exts); fireEvent(result); return result; } @@ -250,91 +198,35 @@ @Override public WikittyEvent deleteExtension( String securityToken, Collection<String> extNames) { - WikittyEvent result = ws.deleteExtension(securityToken, extNames); + WikittyEvent result = getDelegate().deleteExtension(securityToken, extNames); fireEvent(result); return result; } @Override - public WikittyExtension restoreExtension(String securityToken, String id) { - // no notification - return ws.restoreExtension(securityToken, id); - } - - @Override - public WikittyExtension restoreExtensionLastVersion( - String securityToken, String name) { - // no notification - return ws.restoreExtensionLastVersion(securityToken, name); - } - - @Override - public List<Wikitty> restore(String securityToken, List<String> ids) { - // no notification - return ws.restore(securityToken, ids); - } - - @Override public WikittyEvent delete(String securityToken, Collection<String> ids) { - WikittyEvent result = ws.delete(securityToken, ids); + WikittyEvent result = getDelegate().delete(securityToken, ids); // notify listeners fireEvent(result); return result; } @Override - public PagedResult<String> findAllByCriteria(String securityToken, - Criteria criteria) { - // no notification - return ws.findAllByCriteria(securityToken, criteria); - } - - @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { - // no notification - return ws.findByCriteria(securityToken, criteria); - } - - @Override - public WikittyTree restoreTree(String securityToken, String wikittyId) { - // no notification - return ws.restoreTree(securityToken, wikittyId); - } - - @Override public WikittyEvent deleteTree(String securityToken, String wikittyId) { - WikittyEvent result = ws.deleteTree(securityToken, wikittyId); + WikittyEvent result = getDelegate().deleteTree(securityToken, wikittyId); fireEvent(result); return result; } @Override - public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, - Criteria filter) { - // no notification - return ws.restoreNode(securityToken, wikittyId, filter); + public WikittyEvent replay( + String securityToken, List<WikittyEvent> events, boolean force) { + WikittyEvent result = getDelegate().replay(securityToken, events, force); + // notify listeners + fireEvent(result); + return result; } - @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, - String wikittyId, Criteria filter) { - // no notification - return ws.restoreChildren(securityToken, wikittyId, filter); - } - - @Override - public Wikitty restoreVersion( - String securityToken, String wikittyId, String version) { - // no notification - return ws.restoreVersion(securityToken, wikittyId, version); - } - - @Override - public void syncSearchEngine(String securityToken) { - // no notification - ws.syncSearchEngine(securityToken); - } - /** * Fire event to all registred listener. * @@ -389,25 +281,6 @@ super.finalize(); } - @Override - public WikittyEvent replay( - String securityToken, List<WikittyEvent> events, boolean force) { - WikittyEvent result = ws.replay(securityToken, events, force); - // notify listeners - fireEvent(result); - return result; - } - - @Override - public boolean exists(String securityToken, String wikittyId) { - return ws.exists(securityToken, wikittyId); - } - - @Override - public boolean isDeleted(String securityToken, String wikittyId) { - return ws.isDeleted(securityToken, wikittyId); - } - /** * Thread utilise pour envoyer les events. On rend accessible ce thread * pour pouvoir y acceder depuis l'exterieur (pour l'instant pour les tests Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-12-22 17:50:50 UTC (rev 646) @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -67,13 +68,11 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyServiceSecurity implements WikittyService { +public class WikittyServiceSecurity extends WikittyServiceDelegator { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceSecurity.class); - protected WikittyServiceEnhanced ws; - /** cache de l'id du groupe AppAdmin */ transient protected String appAdminGroupId = null; @@ -83,26 +82,29 @@ * @param ws */ public WikittyServiceSecurity(ApplicationConfig config, WikittyService ws) { - this.ws = new WikittyServiceEnhanced(ws); + super(ws); } @Override public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { - ws.addWikittyServiceListener(listener, type); + getDelegate().addWikittyServiceListener(listener, type); } @Override public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { - ws.addWikittyServiceListener(listener, type); + getDelegate().addWikittyServiceListener(listener, type); } @Override public String login(String login, String password) { - Wikitty user = ws.findByCriteria(null, Search.query().eq( + String userId = getDelegate().findByCriteria(null, Search.query().eq( WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).criteria()); - if (user == null) { - throw new IllegalArgumentException(String.format("no such account '%s'", login)); + if (userId == null) { + throw new IllegalArgumentException(String.format( + "no such account '%s'", login)); } else { + Wikitty user = WikittyServiceEnhanced.restore( + getDelegate(), null, userId); // check password is valid if (WikittyUserHelper.getPassword(user).equals(password)) { String tokenId = WikittyUtil.genSecurityTokenId(); @@ -111,7 +113,7 @@ WikittyTokenHelper.addExtension(wikittyToken); WikittyTokenHelper.setUser(wikittyToken, user.getId()); WikittyTokenHelper.setDate(wikittyToken, new Date()); - ws.store(null, Arrays.asList(wikittyToken), false); + getDelegate().store(null, Arrays.asList(wikittyToken), false); log.debug(String.format("token '%s' is for login '%s'", tokenId, login)); return tokenId; @@ -123,11 +125,8 @@ @Override public void logout(String securityToken) { - if (securityToken == null) { - throw new IllegalArgumentException("security token is null"); - } else { - getUserId(securityToken); // will throw exception if token is not valid - ws.delete(securityToken, Arrays.asList(securityToken)); + if (securityToken != null) { + getDelegate().delete(securityToken, Arrays.asList(securityToken)); } } @@ -136,7 +135,7 @@ String userId = getUserId(securityToken); if (isAppAdmin(securityToken, userId)) { // seul les AppAdmin on le droit a cette method - WikittyEvent result = ws.clear(securityToken); + WikittyEvent result = getDelegate().clear(securityToken); return result; } else { throw new SecurityException(_("user %s can't clear data", userId)); @@ -174,7 +173,7 @@ checkDeleteExtension(securityToken, e.getDeletedExtensions()); } } - WikittyEvent result = ws.replay(securityToken, events, force); + WikittyEvent result = getDelegate().replay(securityToken, events, force); return result; } @@ -205,7 +204,7 @@ public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { checkStore(securityToken, wikitties); - WikittyEvent result = ws.store(securityToken, wikitties, force); + WikittyEvent result = getDelegate().store(securityToken, wikitties, force); return result; } @@ -223,9 +222,11 @@ for (Wikitty wikitty : wikitties) { // usual case, a user want to store a wikitty - Wikitty oldVersion = ws.restore(securityToken, wikitty.getId()); + Wikitty oldVersion = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, wikitty.getId()); - Collection<String> newExtensions = new ArrayList<String>(wikitty.getExtensionNames()); + Collection<String> newExtensions = new ArrayList<String>( + wikitty.getExtensionNames()); if (oldVersion != null) { // we already checked the rights for those extension // re-do the check has too much cost, avoid it @@ -250,26 +251,32 @@ for (String fqFieldDirtyName : wikitty.getDirty()) { - String concernedExtensionName = WikittyUtil.getExtensionNameFromFQFieldName(fqFieldDirtyName); + String concernedExtensionName = WikittyUtil + .getExtensionNameFromFQFieldName(fqFieldDirtyName); if (log.isTraceEnabled()) { - log.trace(String.format("will update field %s from extension %s", - fqFieldDirtyName, concernedExtensionName)); + log.trace(String.format( + "will update field %s from extension %s", + fqFieldDirtyName, concernedExtensionName)); } boolean fieldRequireAdminRights = // true if field is a field of WikittyAuthorisation - // concerned extension is "WikittyAuthorisation" - WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals(concernedExtensionName) - // or concerned extension is something like "AnyExtension:WikittyAuthorisation" - || WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals( - WikittyUtil.getMetaExtensionNameFromFQMetaExtensionName(concernedExtensionName)); + // concerned extension is "WikittyAuthorisation" + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals( + concernedExtensionName) + // or concerned extension is something like "AnyExtension:WikittyAuthorisation" + || WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals( + WikittyUtil.getMetaExtensionNameFromFQMetaExtensionName( + concernedExtensionName)); boolean canChange; // will be true if user can modify the value of this field // according to his level of rights if (fieldRequireAdminRights) { - canChange = canAdmin(securityToken, userId, concernedExtensionName, wikitty); + canChange = canAdmin(securityToken, + userId, concernedExtensionName, wikitty); } else { - canChange = canWrite(securityToken, userId, concernedExtensionName, wikitty); + canChange = canWrite(securityToken, + userId, concernedExtensionName, wikitty); } // TODO poussin 20101208 quel est l'interet de faire cette copie ? @@ -295,7 +302,7 @@ @Override public List<Wikitty> restore(String securityToken, List<String> ids) { String userId = getUserId(securityToken); - List<Wikitty> wikitties = ws.restore(securityToken, ids); + List<Wikitty> wikitties = getDelegate().restore(securityToken, ids); for (Wikitty wikitty : wikitties) { if (wikitty != null) { refuseUnauthorizedRead(securityToken, userId, wikitty); @@ -311,8 +318,10 @@ if (wikitty != null) { for (String extensionName : wikitty.getExtensionNames()) { if ( ! canRead(securityToken, userId, extensionName, wikitty)) { - throw new SecurityException(_("user %s can't read extension %s on wikitty %s, it may be due to a global policy on the wikitty", - userId, extensionName, wikitty)); + throw new SecurityException(_( + "user %s can't read extension %s on wikitty %s," + + " it may be due to a global policy on the wikitty", + userId, extensionName, wikitty)); } } } @@ -395,7 +404,7 @@ @Override public WikittyEvent delete(String securityToken, Collection<String> ids) { checkDelete(securityToken, ids); - WikittyEvent result = ws.delete(securityToken, ids); + WikittyEvent result = getDelegate().delete(securityToken, ids); return result; } @@ -407,7 +416,7 @@ public void checkDelete(String securityToken, Collection<String> ids) { String userId = getUserId(securityToken); List<String> idsAsList = new ArrayList<String>(ids); - List<Wikitty> wikitties = ws.restore(securityToken, idsAsList); + List<Wikitty> wikitties = getDelegate().restore(securityToken, idsAsList); for (Wikitty wikitty : wikitties) { for (String extensionName : wikitty.getExtensionNames()) { if ( ! canWrite(securityToken, userId, extensionName, wikitty)) { @@ -435,7 +444,8 @@ @Override public boolean canDelete(String securityToken, String wikittyId) { boolean result = true; - Wikitty wikitty = WikittyServiceEnhanced.restore(ws, securityToken, wikittyId); + Wikitty wikitty = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, wikittyId); if (wikitty != null) { String userId = getUserId(securityToken); for (String extName : wikitty.getExtensionNames()) { @@ -452,7 +462,7 @@ public boolean canRead(String securityToken, String wikittyId) { boolean result = true; String userId = getUserId(securityToken); - Wikitty wikitty = WikittyServiceEnhanced.restore(ws, securityToken, wikittyId); + Wikitty wikitty = WikittyServiceEnhanced.restore(getDelegate(), securityToken, wikittyId); for (String extName : wikitty.getExtensionNames()) { result = result && isReader(securityToken, userId, wikitty, extName); if (!result) { @@ -462,19 +472,6 @@ return result; } - @Override - public List<String> getAllExtensionIds(String securityToken) { - // All people can read extension - return ws.getAllExtensionIds(securityToken); - } - - @Override - public List<String> getAllExtensionsRequires( - String securityToken, String extensionName) { - // All people can read extension - return ws.getAllExtensionsRequires(securityToken, extensionName); - } - /* *** storing and restoring extensions ***/ protected void checkStoreExtension(String securityToken, @@ -502,41 +499,20 @@ public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { checkStoreExtension(securityToken, exts); - return ws.storeExtension(securityToken, exts); + return getDelegate().storeExtension(securityToken, exts); } @Override public WikittyEvent deleteExtension( String securityToken, Collection<String> extNames) { checkDeleteExtension(securityToken, extNames); - return ws.deleteExtension(securityToken, extNames); + return getDelegate().deleteExtension(securityToken, extNames); } - - @Override - public WikittyExtension restoreExtension(String securityToken, String id) { - // All people can read extension - return ws.restoreExtension(securityToken, id); - } @Override - public WikittyExtension restoreExtensionLastVersion( - String securityToken, String name) { - // All people can read extension - return ws.restoreExtensionLastVersion(securityToken, name); - } - - @Override - public PagedResult<String> findAllByCriteria(String securityToken, - Criteria criteria) { - // All people can read PagedResult that contains only id - PagedResult<String> result = ws.findAllByCriteria(securityToken, criteria); - return result; - } - - @Override public WikittyTree restoreTree(String securityToken, String wikittyId) { String userId = getUserId(securityToken); - WikittyTree restoredTree = ws.restoreTree(securityToken, wikittyId); + WikittyTree restoredTree = getDelegate().restoreTree(securityToken, wikittyId); checkRestoreTree(securityToken, userId, restoredTree); return restoredTree; } @@ -549,64 +525,37 @@ } - protected void checkRestoreTreeNode(String securityToken, String userId, WikittyTreeNode treeNode) { - Wikitty treeNodeWikitty = WikittyUtil.getWikitty(ws, securityToken, treeNode); + private void checkRestoreTreeNode(String securityToken, String userId, WikittyTreeNode treeNode) { + Wikitty treeNodeWikitty = WikittyUtil.getWikitty(getDelegate(), securityToken, treeNode); refuseUnauthorizedRead(securityToken, userId, treeNodeWikitty); } @Override - public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { - String userId = getUserId(securityToken); - Entry<WikittyTreeNode, Integer> entry = ws.restoreNode(securityToken, wikittyId, filter); - checkRestoreTreeNode(securityToken, userId, entry.getKey()); - return entry; - } - - @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, - String wikittyId, - Criteria filter) { - String userId = getUserId(securityToken); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(securityToken, wikittyId, filter); - for (Map.Entry<WikittyTreeNode, Integer> child : children.entrySet()) { - checkRestoreTreeNode(securityToken, userId, child.getKey()); - } - return children; - } - - @Override public WikittyEvent deleteTree(String securityToken, String treeNodeId) { - WikittyTreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); - Wikitty treeNodeWikitty = WikittyUtil.getWikitty(ws, securityToken, treeNode); + Wikitty treeNodeWikitty = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, treeNodeId); - Collection<Wikitty> wikitties = Arrays.asList(treeNodeWikitty); + Collection<Wikitty> wikitties = Collections.singletonList(treeNodeWikitty); + // TODO poussin 20101222 perhaps we must check deletion authorization + // for all children ? checkStore(securityToken, wikitties); - return ws.deleteTree(securityToken, treeNodeId); + return getDelegate().deleteTree(securityToken, treeNodeId); } @Override public Wikitty restoreVersion(String securityToken, String wikittyId, String version) { - Wikitty wikitty = ws.restoreVersion(securityToken, wikittyId, version); + Wikitty wikitty = getDelegate().restoreVersion(securityToken, wikittyId, version); String userId = getUserId(securityToken); refuseUnauthorizedRead(securityToken, userId, wikitty); return wikitty; } @Override - public Wikitty findByCriteria(String securityToken, - Criteria criteria) { - Wikitty wikitty = ws.findByCriteria(securityToken, criteria); - String userId = getUserId(securityToken); - refuseUnauthorizedRead(securityToken, userId, wikitty); - return wikitty; - } - - @Override public void syncSearchEngine(String securityToken) { String userId = getUserId(securityToken); if (isAppAdmin(securityToken, userId)) { // seul les AppAdmin on le droit a cette method - ws.syncSearchEngine(securityToken); + getDelegate().syncSearchEngine(securityToken); } else { throw new SecurityException(_("user %s can't sync search engine", getUserId(securityToken))); @@ -626,7 +575,8 @@ // recuperation de l'utilisateur associe au securityToken // le securityToken est aussi l'id de l'objet if (securityToken != null) { - Wikitty securityTokenWikitty = ws.restore(securityToken, securityToken); + Wikitty securityTokenWikitty = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, securityToken); if (securityTokenWikitty == null) { throw new SecurityException("bad (obsolete ?) token"); } else { @@ -756,7 +706,8 @@ // user don't have right on current object, check parent right String parentId = WikittyAuthorisationHelper.getParent(extensionRights); if (parentId != null) { - Wikitty parent = ws.restore(securityToken, parentId); + Wikitty parent = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, parentId); isMember = isMember(securityToken, userId, parent, fqFieldName); } } @@ -777,18 +728,18 @@ /** get the wikitty with extension WikittyGroup that contains all app-admin. */ protected Wikitty getAppAdminGroup(String securityToken) { - Wikitty group; - if (appAdminGroupId == null) { + // on a deja fait la recherche precedement, on essaie de reutilise + // le meme id + Wikitty group = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, appAdminGroupId); + if (group == null) { // 1er fois, on le recherche - group = ws.findByCriteria(securityToken, Search.query().eq( - WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, + String groupId = getDelegate().findByCriteria(securityToken, + Search.query().eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, WikittySecurityHelper.WIKITTY_APPADMIN_GROUP_NAME).criteria()); - // group peut-etre null s'il n'existe pas - } else { - // on a deja fait la recherche precedement, on essaie de reutilise - // le meme id - group = ws.restore(securityToken, appAdminGroupId); - // group peut-etre null, si entre temps un admin a supprime le group + appAdminGroupId = groupId; + group = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, appAdminGroupId); } return group; @@ -809,9 +760,11 @@ if (id.equals(userId)) { return true; } else { - Wikitty groupWikitty = ws.restore(securityToken, id); + Wikitty groupWikitty = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, id); if (WikittyGroupHelper.hasExtension(groupWikitty)) { - Set<String> members = WikittyGroupHelper.getMembers(groupWikitty); + Set<String> members = + WikittyGroupHelper.getMembers(groupWikitty); return isMember(securityToken, userId, members); } } @@ -841,24 +794,12 @@ String extensionName) { String wikittyAuthorisationId = WikittyMetaExtensionUtil.generateId( WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, extensionName); - Wikitty wikittyAuthorisation = ws.restore(securityToken, wikittyAuthorisationId); + Wikitty wikittyAuthorisation = WikittyServiceEnhanced.restore( + getDelegate(), securityToken, wikittyAuthorisationId); if (wikittyAuthorisation == null) { log.debug(extensionName + " has no authorization attached"); } return wikittyAuthorisation; } - @Override - public boolean exists(String securityToken, String wikittyId) { - // no need security check for this action - return ws.exists(securityToken, wikittyId); - } - - @Override - public boolean isDeleted(String securityToken, String wikittyId) { - // no need security check for this action - return ws.isDeleted(securityToken, wikittyId); - } - - } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-22 17:50:50 UTC (rev 646) @@ -786,7 +786,7 @@ } @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { + public String findByCriteria(String securityToken, Criteria criteria) { WikittyTransaction tx = WikittyTransaction.get(); boolean txBeginHere = false; try { @@ -795,14 +795,15 @@ txBeginHere = true; } + // TODO poussin 20101222 perhaps we must do a copy of criteria + // before modify it with index, to prevent bad side effect ? criteria.setFirstIndex(0).setEndIndex(1); PagedResult<String> pages = findAllByCriteria( securityToken, criteria); - Wikitty result = null; + String result = null; if (pages.size() > 0) { - String id = pages.getFirst(); - result = restore(securityToken, id); + result = pages.getFirst(); } if (txBeginHere) { @@ -932,7 +933,7 @@ } @Override - public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, + public Map.Entry<String, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction tx = WikittyTransaction.get(); boolean txBeginHere = false; @@ -942,26 +943,20 @@ txBeginHere = true; } + HashMap.SimpleEntry<String, Integer> result = null; Wikitty w = restore(securityToken, wikittyId); - if(w == null) { - if (txBeginHere) { - tx.commit(); + if(w != null) { + if (!w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { + throw new WikittyException(String.format( + "Wikitty '%s' do not handle extension %s", + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE)); } - return null; - } - if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { - throw new WikittyException(String.format( - "Wikitty '%s' do not handle extension %s", - wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); + Integer count = getSearchEngine().findNodeCount(tx, w, filter); + + result = new SimpleEntry<String, Integer>(wikittyId, count); } - WikittyTreeNode node = new WikittyTreeNodeImpl(w); - Integer count = getSearchEngine().findNodeCount(tx, w, filter); - - HashMap.SimpleEntry<WikittyTreeNode, Integer> result = - new SimpleEntry<WikittyTreeNode, Integer>(node, count); - if (txBeginHere) { tx.commit(); } @@ -980,7 +975,7 @@ } @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, + public Map<String, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction tx = WikittyTransaction.get(); boolean txBeginHere = false; @@ -990,42 +985,18 @@ txBeginHere = true; } + Map<String, Integer> result = null; Wikitty w = restore(securityToken, wikittyId); - if(w == null) { - if (txBeginHere) { - tx.commit(); + if(w != null) { + if (!w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { + throw new WikittyException(String.format( + "Wikitty '%s' do not handle extension %s", + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE)); } - return null; - } - if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { - throw new WikittyException(String.format( - "Wikitty '%s' do not handle extension %s", - wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); + result = getSearchEngine().findAllChildrenCount(tx, w, filter); } - Map<WikittyTreeNode, Integer> result = new LinkedHashMap<WikittyTreeNode, Integer>(); - - Map<String, Integer> search = getSearchEngine().findAllChildrenCount( - tx, w, filter); - Set<Entry<String, Integer>> children = search.entrySet(); - for (Entry<String, Integer> child : children) { - Integer count = child.getValue(); - - String id = child.getKey(); - Wikitty wikitty = restore(securityToken, id); - if (!wikitty.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - // si cette exception est leve, c'est qu'il y a une mauvaise - // implantation de l'api et une erreur d'interpretation - // entre children et attachment voir l'implantation de la - // methode getSearchEngine().findAllChildrenCount - throw new WikittyException("API error, api restore tree node, but wikitty is not a tree node"); - } - WikittyTreeNode node = new WikittyTreeNodeImpl(wikitty); - - result.put(node, count); - } - if (txBeginHere) { tx.commit(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-12-22 17:50:50 UTC (rev 646) @@ -47,6 +47,7 @@ import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyTree; import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.search.Search; /** * @@ -310,15 +311,13 @@ } @Override - public Wikitty findByCriteria(String securityToken, Criteria criteria) { - Wikitty result = null; - PagedResult<String> ids = findAllByCriteria(securityToken, criteria); - List<String> results = ids.getAll(); - if (results.size() > 0) { - String id = results.get(0); - List<Wikitty> wikitties = restore( - securityToken, Collections.singletonList(id)); - result = wikitties.get(0); + public String findByCriteria(String securityToken, Criteria criteria) { + String result = null; + Criteria criteriaLimit = + Search.query(criteria).criteria().setFirstIndex(0).setEndIndex(1); + PagedResult<String> ids = findAllByCriteria(securityToken, criteriaLimit); + if (ids.size() > 0) { + result = ids.getFirst(); } return result; } @@ -334,12 +333,12 @@ } @Override - public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { + public Entry<String, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { + public Map<String, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-12-22 17:50:50 UTC (rev 646) @@ -170,8 +170,10 @@ try { service.logout(invalidToken); + } catch (SecurityException e) { + // log out must be never faild fail(); - } catch (SecurityException e) {} + } // now try to make a valid token invalid service.logout(readerToken); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2010-12-22 17:50:50 UTC (rev 646) @@ -60,9 +60,9 @@ WikittyService ws = WikittyServiceFactory.buildWikittyService(config); Assert.assertEquals(WikittyServiceCached.class, ws.getClass()); - ws = ((WikittyServiceCached)ws).ws; + ws = ((WikittyServiceCached)ws).getDelegate(); Assert.assertEquals(WikittyServiceNotifier.class, ws.getClass()); - ws = ((WikittyServiceNotifier)ws).ws; + ws = ((WikittyServiceNotifier)ws).getDelegate(); Assert.assertEquals(WikittyServiceInMemory.class, ws.getClass()); } @@ -78,11 +78,11 @@ WikittyService ws = WikittyServiceFactory.buildWikittyService(config); Assert.assertEquals(WikittyServiceSecurity.class, ws.getClass()); - ws = ((WikittyServiceEnhanced)((WikittyServiceSecurity) ws).ws).delegate; + ws = ((WikittyServiceSecurity) ws).getDelegate(); Assert.assertEquals(WikittyServiceCached.class, ws.getClass()); - ws = ((WikittyServiceCached) ws).ws; + ws = ((WikittyServiceCached) ws).getDelegate(); Assert.assertEquals(WikittyServiceNotifier.class, ws.getClass()); - ws = ((WikittyServiceNotifier) ws).ws; + ws = ((WikittyServiceNotifier) ws).getDelegate(); Assert.assertEquals(WikittyServiceStorage.class, ws.getClass()); } } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2010-12-22 17:50:50 UTC (rev 646) @@ -26,13 +26,23 @@ import org.junit.Before; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.services.WikittyServiceEnhanced; public abstract class AbstractTestSolr { + protected WikittyProxy proxy = null; + protected WikittyServiceEnhanced ws = new WikittyServiceEnhanced(new WikittyServiceSolr(new WikittyConfig())); + public WikittyProxy getProxy() { + if (proxy == null) { + proxy = new WikittyProxy(ws); + } + return proxy; + } + @Before public void deleteAll() throws Exception { ws.clear(null); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2010-12-22 15:04:09 UTC (rev 645) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2010-12-22 17:50:50 UTC (rev 646) @@ -156,7 +156,7 @@ protected Wikitty findNode(String nodeName) { Criteria criteria = Search.query().eq( WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); - Wikitty wikitty = ws.findByCriteria(null, criteria); + Wikitty wikitty = getProxy().findByCriteria(criteria); return wikitty; } @@ -165,7 +165,7 @@ */ protected Wikitty findValue(String value) { Criteria criteria = Search.query().eq("test.name", value).criteria(); - Wikitty wikitty = ws.findByCriteria(null, criteria); + Wikitty wikitty = getProxy().findByCriteria(criteria); return wikitty; } @@ -183,7 +183,8 @@ // Sum children node in node String nodeId = node.getId(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); + Map<WikittyTreeNode, Integer> children = getProxy().restoreChildren( + WikittyTreeNode.class, nodeId, null); /* for (Integer count : children.values()) { @@ -260,7 +261,8 @@ Wikitty node1 = findNode("node1"); String node1Id = node1.getId(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); + Map<WikittyTreeNode, Integer> children = getProxy().restoreChildren( + WikittyTreeNode.class, node1Id, null); assertEquals(3, children.size()); } @@ -275,7 +277,8 @@ String node1Id = node1.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); + Map<WikittyTreeNode, Integer> children = getProxy().restoreChildren( + WikittyTreeNode.class, node1Id, filter); System.out.println(children); assertEquals(3, children.size()); for (Map.Entry<WikittyTreeNode, Integer> e : children.entrySet()) { @@ -288,7 +291,8 @@ Wikitty node11 = findNode("node11"); String node11Id = node11.getId(); - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, null); + Entry<WikittyTreeNode, Integer> count = getProxy().restoreNode( + WikittyTreeNode.class, node11Id, null); assertEquals(3, count.getValue().intValue()); } @@ -298,7 +302,8 @@ String node11Id = node11.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); + Entry<WikittyTreeNode, Integer> count = getProxy().restoreNode( + WikittyTreeNode.class, node11Id, filter); System.out.println(count); assertEquals(1, count.getValue().intValue()); } @@ -308,7 +313,8 @@ // Check that node 2 it has any child Wikitty node2 = findNode("node2"); String node2Id = node2.getId(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); + Map<WikittyTreeNode, Integer> children = getProxy().restoreChildren( + WikittyTreeNode.class, node2Id, null); assertEquals(0, children.size()); // Create a new node, child of node 2 @@ -320,7 +326,8 @@ assertNotNull(found); // Check that it was great added as node2 child - children = ws.restoreChildren(null, node2Id, null); + children = getProxy().restoreChildren( + WikittyTreeNode.class, node2Id, null); assertEquals(1, children.size()); } @@ -418,8 +425,8 @@ WikittyEvent event = ws.store(null, child.getWikitty()); event.update(child.getWikitty()); - Map<WikittyTreeNode, Integer> children = - ws.restoreChildren(null, parent.getWikittyId(), null); + Map<WikittyTreeNode, Integer> children = getProxy().restoreChildren( + WikittyTreeNode.class, parent.getWikittyId(), null); assertEquals(1, children.size()); assertEquals(0, children.get(child).intValue()); @@ -428,7 +435,8 @@ ws.store(null, child.getWikitty()); - children = ws.restoreChildren(null, parent.getWikittyId(), null); + children = getProxy().restoreChildren( + WikittyTreeNode.class, parent.getWikittyId(), null); assertEquals(0, children.size()); } @@ -497,7 +505,8 @@ int sum = sum(node3); assertEquals(2, sum); - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); + Entry<WikittyTreeNode, Integer> count = getProxy().restoreNode( + WikittyTreeNode.class, node3.getId(), null); assertEquals(1, count.getValue().intValue()); sum = sum(node31);

1 0

r645 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bpoussin Date: 2010-12-22 16:04:09 +0100 (Wed, 22 Dec 2010) New Revision: 645 Url: http://nuiton.org/repositories/revision/wikitty/645 Log: inverse time to proxy log time warn(3s) and log level (1s) 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 2010-12-22 14:41:17 UTC (rev 644) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-22 15:04:09 UTC (rev 645) @@ -328,11 +328,11 @@ WIKITTY_PROXY_TIME_TO_LOG_INFO( "wikitty.proxy.timeToLog.info", _("maximum time before send log info with time consumed"), - "5000", Integer.class, false, false), + "1000", Integer.class, false, false), WIKITTY_PROXY_TIME_TO_LOG_WARN( "wikitty.proxy.timeToLog.warn", _("maximum time before send log warn with time consumed"), - "1000", Integer.class, false, false), + "3000", Integer.class, false, false), JCS_DEFAULT( "jcs.default",

1 0