Author: chatellier Date: 2011-01-03 09:25:40 +0000 (Mon, 03 Jan 2011) New Revision: 454 Log: Fix build (scope) and headers Modified: trunk/coser-ui/pom.xml trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties trunk/coser-web/src/main/resources/log4j.properties trunk/coser-web/src/main/resources/struts.xml trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml trunk/coser-web/src/main/webapp/styles/coser.css trunk/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-ui/pom.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -30,6 +30,14 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2010 Ifremer, 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. + * 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 Lesser Public License for more details. + * GNU General 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>. + * 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% */ Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java 2011-01-03 09:25:40 UTC (rev 454) @@ -6,18 +6,17 @@ * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. + * 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 General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * 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% */ Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2010 Ifremer, 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. + * 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 Lesser Public License for more details. + * GNU General 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>. + * 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% */ Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 Ifremer, 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% +### message.index.title=Default Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 Ifremer, 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% +### message.index.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 Ifremer, 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% +### message.index.title=Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer \ No newline at end of file Modified: trunk/coser-web/src/main/resources/log4j.properties =================================================================== --- trunk/coser-web/src/main/resources/log4j.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/log4j.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ ### # #%L -# -# # $Id$ # $HeadURL$ # %% # Copyright (C) 2010 Ifremer, 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. +# 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 Lesser Public License for more details. +# GNU General 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>. +# 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% ### Modified: trunk/coser-web/src/main/resources/struts.xml =================================================================== --- trunk/coser-web/src/main/resources/struts.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8" ?> +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, 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% + --> + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> <constant name="struts.multipart.maxSize" value="100097152"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -1,3 +1,26 @@ +<!-- + #%L + Coser :: Web + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 Ifremer, 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% + --> <decorators defaultdir="/WEB-INF/decorators"> <excludes> <pattern>/styles/*</pattern> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-03 09:25:40 UTC (rev 454) @@ -1,3 +1,26 @@ +/* + * #%L + * Coser :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 Ifremer, 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% + */ body { background-color: #1F7DCB; color: #2A2A2A; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/pom.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -110,7 +110,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.5.2</version> + <version>1.5.3</version> <scope>compile</scope> </dependency> @@ -236,7 +236,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> @@ -298,7 +298,7 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Versions --> - <jaxx.version>2.2.4</jaxx.version> + <jaxx.version>2.2.5</jaxx.version> <i18n.version>2.0.1</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>