January 2011 - Coser-commits - mailman.cloud.codelutin.com

r457 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui java/fr/ifremer/coser/ui/option resources/i18n
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 14:14:02 +0000 (Mon, 03 Jan 2011) New Revision: 457 Log: Add home view with lorem ipsum text Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-03 14:14:02 UTC (rev 457) @@ -60,13 +60,14 @@ <fr.ifremer.coser.ui.widgets.LookAndFeelViewMenuItem text="coser.ui.mainframe.menu.view.lookandfeel" onPropertyChange="getHandler().saveLookAndFeelConfiguration(event)"/> </JMenu> - + <JMenu id='menuHelp' text="coser.ui.mainframe.menu.help"> <JMenuItem text="coser.ui.mainframe.menu.website" onActionPerformed="getHandler().showCoserWebsite()"/> </JMenu> </JMenuBar> <JPanel id="mainViewContent" layout="{new BorderLayout()}" constraints="BorderLayout.CENTER"> + <HomeView handler="{getHandler()}" /> </JPanel> <StatusMessagePanel constraints='BorderLayout.SOUTH' /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 14:14:02 UTC (rev 457) @@ -107,6 +107,15 @@ } /** + * Show home view. + */ + public void showHomeView() { + HomeView homeView = new HomeView(); + homeView.setHandler(this); + setMainComponent(homeView); + } + + /** * Display new creation view in main view. */ public void showProjectCreationView() { @@ -231,9 +240,9 @@ * Ferme le projet. */ public void closeProject() { - setMainComponent(null); view.setProject(null); view.setTitle(_("coser.ui.mainview.titleempty")); + showHomeView(); } /** Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx 2011-01-03 14:14:02 UTC (rev 457) @@ -0,0 +1,32 @@ + +<JPanel layout="{new BorderLayout()}"> + + <CoserFrameHandler id="handler" javaBean="null" /> + + <JLabel text='coser.ui.home.text' constraints="BorderLayout.CENTER" + horizontalAlignment="{SwingConstants.CENTER}" /> + +</JPanel> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-01-03 14:14:02 UTC (rev 457) @@ -28,16 +28,12 @@ import java.net.URL; import java.util.List; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.plaf.PanelUI; import javax.swing.tree.TreePath; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.jxlayer.plaf.BufferedLayerUI; import org.nuiton.util.Resource; import fr.ifremer.coser.CoserConfig; Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-03 14:14:02 UTC (rev 457) @@ -62,6 +62,7 @@ coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check) coser.ui.graph.lengthStructure=Length structure +coser.ui.home.text=Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis indolis consule provenisset actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam. coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.closeProject=Close project Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-03 14:14:02 UTC (rev 457) @@ -62,6 +62,7 @@ coser.ui.graph.compareNumberCatchLength=Comparaison Captures/Tailles coser.ui.graph.compareNumberCatchLengthTip=Affiche les graphiques de comparaison des nombres entre les captures et les tailles (Les donn\u00E9es sont g\u00E9n\u00E9r\u00E9es uniquement lors de la v\u00E9rification des erreurs) coser.ui.graph.lengthStructure=Structures en taille +coser.ui.home.text=<html><center>Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis indolis consule provenisset actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam.</center></html> coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. coser.ui.locale.title=Modification de la langue coser.ui.mainframe.menu.closeProject=Fermer le projet

1 0

r456 - in trunk: coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui coser-web/src/main/java/fr/ifremer/coser/web/actions
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 09:53:04 +0000 (Mon, 03 Jan 2011) New Revision: 456 Log: Remove deprecated converter Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-03 09:53:04 UTC (rev 456) @@ -27,11 +27,6 @@ import static org.nuiton.i18n.I18n._; -import java.util.Locale; - -import org.apache.commons.beanutils.ConvertUtils; -import org.nuiton.util.LocaleConverter; - /** * Coser application configuration. * @@ -44,7 +39,6 @@ public class CoserConfig extends CoserBusinessConfig { public CoserConfig() { - ConvertUtils.register(new LocaleConverter(), Locale.class); // init configuration with default options for (CoserOption o : CoserOption.values()) { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 09:53:04 UTC (rev 456) @@ -32,7 +32,6 @@ import java.io.File; import java.io.IOException; import java.net.URI; -import java.net.URL; import java.util.List; import java.util.Locale; @@ -45,7 +44,6 @@ import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.widget.SwingSession; @@ -56,7 +54,6 @@ import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; -import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.common.CommonHandler; import fr.ifremer.coser.ui.control.ControlHandler; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-03 09:53:04 UTC (rev 456) @@ -28,7 +28,6 @@ import java.util.Date; import java.util.Properties; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext;

1 0

r455 - in trunk/coser-web/src/main: resources webapp/WEB-INF/decorators webapp/images
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 09:49:59 +0000 (Mon, 03 Jan 2011) New Revision: 455 Log: Mise ?\195?\160 jour du logo sih Added: trunk/coser-web/src/main/webapp/images/logo_sih.png Removed: trunk/coser-web/src/main/webapp/images/logo_sih.gif Modified: trunk/coser-web/src/main/resources/struts.xml trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp Modified: trunk/coser-web/src/main/resources/struts.xml =================================================================== --- trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:25:40 UTC (rev 454) +++ trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:49:59 UTC (rev 455) @@ -25,5 +25,8 @@ <!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"/> +  </struts> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-03 09:25:40 UTC (rev 454) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-03 09:49:59 UTC (rev 455) @@ -26,7 +26,7 @@ <div> <img src="images/logo_ifremer.gif" style="width:333px;heigth:69px" /> - <img src="images/logo_sih.gif" /> + <img src="images/logo_sih.png" style="width:178px;heigth:89px" /> <s:url id="localeEN" namespace="/" action="locale"> <s:param name="request_locale" >en</s:param> Deleted: trunk/coser-web/src/main/webapp/images/logo_sih.gif =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/logo_sih.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/logo_sih.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r454 - in trunk: . coser-ui coser-web/src/main/java/fr/ifremer/coser/web coser-web/src/main/resources coser-web/src/main/resources/fr/ifremer/coser/web/actions coser-web/src/main/webapp/WEB-INF coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

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" ?> + + <!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 @@ + <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>  - <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>

1 0