Author: sletellier Date: 2010-11-24 16:19:34 +0100 (Wed, 24 Nov 2010) New Revision: 510 Url: http://nuiton.org/repositories/revision/wikitty/510 Log: - Prevent NPE - Update THIRD-PARTY Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-dto/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -7,7 +7,6 @@ # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.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 # - Lesser General Public License (LGPL) v 3.0 @@ -29,4 +28,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 +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/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-11-24 15:19:34 UTC (rev 510) @@ -209,7 +209,6 @@ + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), WikittyServiceInMemory.class.getName(), String.class, false, false), - WIKITTY_SERVER_CONFIG( "wikitty.service.server.config", _("Jetty server configuration file name"), Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-11-24 15:19:34 UTC (rev 510) @@ -157,7 +157,7 @@ * Par exemple pour org.nuiton.wikitty.WikittyService le nom simple est * WikittyService. * La valeur doit contenir une liste de classes separer par des ','. - * * + * * @param config * @param clazz * @return la liste de classe trouvee ou null si la cle n'existe pas Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-11-24 15:19:34 UTC (rev 510) @@ -115,6 +115,9 @@ } static public String formatDate(Date date) throws ParseException { + if (date == null) { + return null; + } return solrDateFormat.format(date); } 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-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-24 15:19:34 UTC (rev 510) @@ -253,7 +253,9 @@ for (Wikitty w : missingInCache) { // add missing object - fromCache.put(w.getId(), w); + if (w != null) { + fromCache.put(w.getId(), w); + } } Collection<Wikitty> tmp = fromCache.values(); @@ -344,7 +346,10 @@ Collection<Wikitty> wikitties, boolean force) { WikittyEvent result = ws.store(securityToken, wikitties, force); - cache.putAllWikitty(result.getWikitties().values()); + Map<String, Wikitty> wikittiesToCache = result.getWikitties(); + if (wikittiesToCache != null) { + cache.putAllWikitty(wikittiesToCache.values()); + } return result; } Modified: trunk/wikitty-dto/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: dto -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -29,23 +5,25 @@ # - Apache Software License, version 1.1 # - BSD License # - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) 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 # - 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 : # # -#Sat Nov 20 14:37:54 CET 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -org.jgroups--jgroups--2.10.0.GA=LGPL 2.1 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:45:02 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +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 Modified: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: hessian client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -36,12 +12,13 @@ # - Public Domain # - 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 : # # -#Fri Oct 15 16:37:07 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License \ No newline at end of file +#Tue Nov 23 12:51:21 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.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 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,35 +1,15 @@ -### -# #%L -# Wikitty :: hessian server -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache Software License - Version 2.0 # - 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 +# - Eclipse 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 @@ -38,15 +18,16 @@ # - Public Domain # - 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 : # # -#Wed Jul 21 13:45:24 CEST 2010 -com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 -commons-primitives--commons-primitives--1.0=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.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 -woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:53:04 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +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 Modified: trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-jdbc-impl/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: wikitty-jdbc-impl -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -43,22 +19,22 @@ # - Public Domain # - 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 : # # -#Fri Oct 15 14:54:04 CEST 2010 -com.experlog--xapool--1.5.0=Lesser General Public License (LGPL) v 3.0 -commons-primitives--commons-primitives--1.0=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.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 -org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-core--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-expression--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-test--3.0.1.RELEASE=The Apache Software License, Version 2.0 -woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:43:03 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +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 +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 +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 Modified: trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-solr-impl/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: wikitty-solr-impl -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -40,21 +16,22 @@ # - MIT License # - 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 : # # -#Fri Oct 15 14:42:19 CEST 2010 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 -org.springframework--spring-aop--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-asm--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-beans--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-context--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-core--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-expression--3.0.1.RELEASE=The Apache Software License, Version 2.0 -org.springframework--spring-test--3.0.1.RELEASE=The Apache Software License, Version 2.0 -woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:40:39 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +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 +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 +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 Modified: trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-11-24 14:22:43 UTC (rev 509) +++ trunk/wikitty-ui-zk/src/license/THIRD-PARTY.properties 2010-11-24 15:19:34 UTC (rev 510) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: ui-zk -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin -# %% -# 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -42,14 +18,15 @@ # - 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 : # # -#Fri Oct 15 15:54:16 CEST 2010 -commons-primitives--commons-primitives--1.0=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.jgroups--jgroups--2.10.0.GA=Lesser General Public License (LGPL) v 3.0 -woodstox--wstx-asl--3.2.7=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:46:48 CET 2010 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +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