Author: echatellier Date: 2012-02-01 07:46:48 +0100 (Wed, 01 Feb 2012) New Revision: 1402 Url: http://nuiton.org/repositories/revision/wikitty/1402 Log: Fix build to prepare release Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthentication.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAP.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAPTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java trunk/wikitty-api/src/test/resources/xml/importclient.xml trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/pom.xml 2012-02-01 06:46:48 UTC (rev 1402) @@ -200,6 +200,12 @@ <artifactId>solr-core</artifactId> <version>3.5.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -207,6 +213,12 @@ <artifactId>solr-solrj</artifactId> <version>3.5.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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.entities; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthentication.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthentication.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthentication.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 java.util.Arrays; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 java.util.Arrays; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAP.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAP.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAP.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 java.util.Collections; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 java.util.Enumeration; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1695,13 +1695,10 @@ query1.setFirst(0); query1.setLimit(0); results1 = wikittyClient.findAllByQuery(query1); - Assert.assertEquals(17, results1.getTotalResult()); + Assert.assertEquals(11, results1.getTotalResult()); Assert.assertEquals(0, results1.getAll().size()); } - - - - + @Test public void testQueryMarkerSelectSortAndAggregate() throws Exception { assumeTrueSearchEngineCanRunTest(); // pas le meme comportement, a verifier Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAPTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAPTest.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationLDAPTest.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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.logging.Log; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/CategoryImpl.java 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * 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.test; import org.nuiton.wikitty.entities.BusinessEntityImpl; Modified: trunk/wikitty-api/src/test/resources/xml/importclient.xml =================================================================== --- trunk/wikitty-api/src/test/resources/xml/importclient.xml 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-api/src/test/resources/xml/importclient.xml 2012-02-01 06:46:48 UTC (rev 1402) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Wikitty :: api + + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 CodeLutin, Chatellier Eric + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + <wikitty> <extension name='WikittyTreeNode' version='2.0'> <tagvalues> version="2.0"</tagvalues> Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2012-02-01 06:46:48 UTC (rev 1402) @@ -2,7 +2,6 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License -# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -22,14 +21,10 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:19:06 CEST 2011 -antlr--antlr--2.7.2=BSD License +#Wed Feb 01 07:09:33 CET 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1=BSD License jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2012-02-01 06:04:47 UTC (rev 1401) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2012-02-01 06:46:48 UTC (rev 1402) @@ -2,7 +2,6 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License -# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -21,14 +20,10 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 30 14:22:53 CEST 2011 -antlr--antlr--2.7.2=BSD License +#Wed Feb 01 07:00:14 CET 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1=BSD License jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1