Author: tchemit Date: 2014-04-27 19:12:24 +0200 (Sun, 27 Apr 2014) New Revision: 3881 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3881 Log: optimze dependencies + add missing license headers Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java trunk/pollen-rest-api/pom.xml trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java trunk/pollen-services/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -27,10 +27,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> <dependency> <groupId>org.nuiton.topia</groupId> Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,13 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,13 +20,13 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 # - The MIT License -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 02 18:32:57 CEST 2013 +#Sun Apr 27 18:43:51 CEST 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence.entity; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Created on 4/25/14. * Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -24,7 +24,6 @@ <artifactId>pollen-persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-services</artifactId> @@ -32,10 +31,19 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> </dependency> - <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion-unittest</artifactId> @@ -45,6 +53,10 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <dependency> <groupId>javax</groupId> Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.rest.api; +/* + * #%L + * Pollen :: Rest Api + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.pollen.services.PollenSecurityContext; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.service.AuthService; Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.rest.api; +/* + * #%L + * Pollen :: Rest Api + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-services/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -24,7 +24,16 @@ <dependency> <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <!--dependency> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-junit</artifactId> + </dependency--> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> </dependency> <dependency> @@ -54,6 +63,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <!--dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId>