Author: sletellier Date: 2010-11-23 12:31:51 +0100 (Tue, 23 Nov 2010) New Revision: 502 Url: http://nuiton.org/repositories/revision/wikitty/502 Log: Fix dependency Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/pom.xml 2010-11-23 11:31:51 UTC (rev 502) @@ -105,12 +105,12 @@ <scope>compile</scope> </dependency> - <!--dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.3</version> <scope>compile</scope> - </dependency--> + </dependency> <dependency> <groupId>org.nuiton.eugene</groupId> @@ -349,6 +349,7 @@ <artifactId>hibernate-entitymanager</artifactId> <version>3.5.6-Final</version> </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-api/pom.xml 2010-11-23 11:31:51 UTC (rev 502) @@ -63,6 +63,11 @@ </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2010-11-23 11:31:51 UTC (rev 502) @@ -1,27 +1,3 @@ -### -# #%L -# Wikitty :: api -# -# $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 : @@ -31,24 +7,26 @@ # - 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 # - 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:06:43 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 -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 -xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme! Lab Software License +#Tue Nov 23 12:11:31 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 +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 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-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-11-23 11:31:51 UTC (rev 502) @@ -104,6 +104,8 @@ (Class<WikittyServiceNotifier.RemoteNotifierTransporter>)config.getOptionAsClass( WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER.getKey()); + log.info(transporterClass + " " + config.getOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER.getKey())); + MutablePicoContainer pico = new TransientPicoContainer(); pico.addComponent(config); pico.addComponent(notifier); Modified: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2010-11-23 11:31:51 UTC (rev 502) @@ -1,44 +1,20 @@ -### -# #%L -# Wikitty :: generators -# -# $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 : +# - Apache Software License, Version 2.0 # - BSD License # - LGPL # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 -# - dom4j # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Sep 09 18:12:23 CEST 2010 -commons-digester--commons-digester--2.0=Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +#Tue Nov 23 12:05:48 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 +jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-hessian-client/pom.xml 2010-11-23 11:31:51 UTC (rev 502) @@ -28,6 +28,27 @@ <artifactId>hessian</artifactId> <scope>compile</scope> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + </dependency> + + <dependency> + <groupId>jivesoftware</groupId> + <artifactId>smackx</artifactId> + </dependency> + </dependencies> <!-- ************************************************************* --> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-11-23 11:04:58 UTC (rev 501) +++ trunk/wikitty-hessian-server/pom.xml 2010-11-23 11:31:51 UTC (rev 502) @@ -86,6 +86,11 @@ <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> <!-- TEST --> <dependency>