- Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r274 - trunk
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 10:36:10 +0200 (Wed, 03 Jul 2013) New Revision: 274 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable version of nuiton-web Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 09:58:29 UTC (rev 273) +++ trunk/pom.xml 2013-07-03 08:36:10 UTC (rev 274) @@ -112,7 +112,7 @@  <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion> - <nuitonWebVersion>1.14-SNAPSHOT</nuitonWebVersion> + <nuitonWebVersion>1.14</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.172</h2Version> <struts2Version>2.3.14.2</struts2Version>

1 0

r273 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 02 Jul '13

02 Jul '13

Author: bleny Date: 2013-07-02 11:58:29 +0200 (Tue, 02 Jul 2013) New Revision: 273 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: shorter labels in choose-activity Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-01 15:23:37 UTC (rev 272) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-02 09:58:29 UTC (rev 273) @@ -50,22 +50,22 @@ </header> <s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> -<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Traiter kanbans (1)</s:a> +<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Kanbans (1)</s:a> <s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> -<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Traiter listes à servir (2)</s:a> +<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Listes à servir (2)</s:a> <s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> -<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Traiter les réceptions fournisseurs (3)</s:a> +<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Réceptions fournisseurs (3)</s:a> <s:url namespace="/" action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> -<s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Traiter les réceptions fournisseurs préparées (4)</s:a> +<s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Rangement toiles (4)</s:a> <s:url namespace="/" action="storage-transfer-location!input" id="storageTransferUrl"/> <s:a href="%{storageTransferUrl}" cssClass="btn btn-block" id="storageTransferLink" >Transfert de stock (5)</s:a> <s:url namespace="/" action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> -<s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Prélèvement immédiat (6)</s:a> +<s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Sorties toiles (6)</s:a> <s:if test="movementOrderResume" > <s:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl">

1 0

r272 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 17:23:37 +0200 (Mon, 01 Jul 2013) New Revision: 272 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update fixtures according to replace 'REC' by ' REC' Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-01 15:20:21 UTC (rev 271) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-01 15:23:37 UTC (rev 272) @@ -228,7 +228,7 @@ &locationRecU01 !location id: locationRecU01 warehouse: *U01 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -236,7 +236,7 @@ &locationRecU02 !location id: locationRecU02 warehouse: *U02 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -244,7 +244,7 @@ &locationRecU03 !location id: locationRecU03 warehouse: *U03 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -252,7 +252,7 @@ &locationRecU04 !location id: locationRecU04 warehouse: *U04 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -260,7 +260,7 @@ &locationRecSOM !location id: locationRecSOM warehouse: *SOM - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -268,7 +268,7 @@ &locationRecB01 !location id: locationRecB01 warehouse: *B01 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false

1 0

r271 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 17:20:21 +0200 (Mon, 01 Jul 2013) New Revision: 271 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: log jdbc oracle level Modified: trunk/magalie-web/src/main/resources/log4j.properties Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-07-01 15:12:41 UTC (rev 270) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-07-01 15:20:21 UTC (rev 271) @@ -34,17 +34,19 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n -# log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE - +# global level log4j.logger.com.franciaflex.magalie=TRACE -#log4j.logger.com.franciaflex.magalie.web.MagalieInterceptor=WARN +### persistence level +# log4j.logger.org.nuiton.jpa=TRACE +log4j.logger.oracle.jdbc.driver=TRACE + +### services level # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE # log4j.logger.com.franciaflex.magalie.services.service.ArticleStorageService=TRACE -# log4j.logger.org.nuiton.jpa=TRACE - +### web level +# log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE +# log4j.logger.com.franciaflex.magalie.web.MagalieInterceptor=WARN # annoying errors -# log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL # log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL -

1 0

r270 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-persistence/src/main/resources magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 17:12:41 +0200 (Mon, 01 Jul 2013) New Revision: 270 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties trunk/magalie-web/src/main/resources/xwork-conversion.properties Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-07-01 15:12:41 UTC (rev 270) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 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 com.google.common.base.Objects; import javax.persistence.Entity; Modified: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-07-01 15:12:41 UTC (rev 270) @@ -1,2 +1,24 @@ +### +# #%L +# MagaLiE :: Persistence +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2013 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% +### hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy hibernate.dialect=com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect Modified: trunk/magalie-web/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/magalie-web/src/main/resources/xwork-conversion.properties 2013-07-01 15:12:07 UTC (rev 269) +++ trunk/magalie-web/src/main/resources/xwork-conversion.properties 2013-07-01 15:12:41 UTC (rev 270) @@ -1,2 +1,24 @@ +### +# #%L +# MagaLiE :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2013 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% +### java.lang.Double=org.nuiton.web.struts2.converters.DoubleConverter double=org.nuiton.web.struts2.converters.DoubleConverter

1 0

r269 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 17:12:07 +0200 (Mon, 01 Jul 2013) New Revision: 269 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: replace const 'REC' by ' REC' Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-07-01 14:58:37 UTC (rev 268) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-07-01 15:12:07 UTC (rev 269) @@ -104,7 +104,7 @@ } public static String codeForReceptionLocations() { - return "REC"; + return " REC"; } public static Predicate<Location> isNotReceptionLocation() {

1 0

r268 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web resources
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 16:58:37 +0200 (Mon, 01 Jul 2013) New Revision: 268 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: redirect user to login page Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/resources/struts.xml Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-01 13:44:57 UTC (rev 267) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-01 14:58:37 UTC (rev 268) @@ -27,7 +27,12 @@ import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.service.FixturesService; +import com.franciaflex.magalie.web.action.ChooseCompanyAction; +import com.franciaflex.magalie.web.action.IndexAction; +import com.franciaflex.magalie.web.action.LoginAction; +import com.franciaflex.magalie.web.action.ReportAction; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.commons.collections.CollectionUtils; @@ -47,6 +52,9 @@ */ public class MagalieInterceptor implements Interceptor { + public static final ImmutableSet<Class<? extends MagalieActionSupport>> ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER = + ImmutableSet.of(LoginAction.class, IndexAction.class, ChooseCompanyAction.class, ReportAction.class); + private static final Log log = LogFactory.getLog(MagalieInterceptor.class); protected boolean fixturesLoaded = false; @@ -93,9 +101,11 @@ } + Class<?> actionClass = action.getClass(); + Set<PropertyDescriptor> descriptors = BeanUtil.getDescriptors( - action.getClass(), + actionClass, BeanUtil.IS_WRITE_DESCRIPTOR); for (PropertyDescriptor propertyDescriptor : descriptors) { @@ -134,6 +144,28 @@ try { + // prevent accessing a page without a session + if (magalieSession.getMagalieUser() == null) { + + if (ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER.contains(actionClass)) { + + if (log.isDebugEnabled()) { + log.debug("user has no session but can access to action " + action); + } + + } else { + + if (log.isDebugEnabled()) { + log.debug("user has no session: illegal access to action " + action + + ", redirecting user to login page"); + } + + return "redirect-to-login"; + + } + + } + return invocation.invoke(); } finally { Modified: trunk/magalie-web/src/main/resources/struts.xml =================================================================== --- trunk/magalie-web/src/main/resources/struts.xml 2013-07-01 13:44:57 UTC (rev 267) +++ trunk/magalie-web/src/main/resources/struts.xml 2013-07-01 14:58:37 UTC (rev 268) @@ -28,6 +28,7 @@ <constant name="struts.convention.default.parent.package" value="magalie" /> <package name="magalie" namespace="/" extends="json-default"> + <interceptors> <interceptor name="magalieInterceptor" class="com.franciaflex.magalie.web.MagalieInterceptor"/> @@ -40,6 +41,10 @@ <default-interceptor-ref name="magalieStack"/> + <global-results> + <result name="redirect-to-login" type="redirect">/</result> + </global-results> + </package>

1 0

r267 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 15:44:57 +0200 (Mon, 01 Jul 2013) New Revision: 267 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: make choose-activity header shorter Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-06-28 14:21:10 UTC (rev 266) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-01 13:44:57 UTC (rev 267) @@ -44,12 +44,9 @@ </head> <header> - <dl class="dl-horizontal"> - <dt>Identifiant</dt> - <dd><s:property value="magalieUser.name" /> (<s:property value="magalieUser.login" />)</dd> - <dt>Bâtiment</dt> - <dd><s:property value="building.code" /></dd> - </dl> + <p> + <s:property value="magalieUser.name" /> (<s:property value="building.code" />) + </p> </header> <s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/>

1 0

r266 - trunk/magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com 28 Jun '13

28 Jun '13

Author: bleny Date: 2013-06-28 16:21:10 +0200 (Fri, 28 Jun 2013) New Revision: 266 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: hibernate.show_sql=true Modified: trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-28 14:16:34 UTC (rev 265) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-28 14:21:10 UTC (rev 266) @@ -26,7 +26,7 @@ javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy

1 0

r265 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web resources
by bleny＠users.forge.codelutin.com 28 Jun '13

28 Jun '13

Author: bleny Date: 2013-06-28 16:16:34 +0200 (Fri, 28 Jun 2013) New Revision: 265 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add more logs for session Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/resources/log4j.properties Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-06-28 14:16:34 UTC (rev 265) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.ActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,6 +36,7 @@ private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(MagalieActionSupport.class); + public static final List<String> SHORTCUTS = Arrays.asList(new String[]{ "0", "1", "2", "3", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" }); @@ -47,4 +49,9 @@ return super.hasActionErrors() || super.hasActionMessages(); } + @Override + public String toString() { + return Objects.toStringHelper(this).toString(); + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-06-28 14:16:34 UTC (rev 265) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.Warehouse; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -105,4 +106,13 @@ this.activity = activity; } + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("user", magalieUser) + .add("building", building) + .add("activity", activity) + .toString(); + } + } Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 14:16:34 UTC (rev 265) @@ -37,7 +37,7 @@ # log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE log4j.logger.com.franciaflex.magalie=TRACE -log4j.logger.com.franciaflex.magalie.web.MagalieInterceptor=WARN +#log4j.logger.com.franciaflex.magalie.web.MagalieInterceptor=WARN # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE # log4j.logger.com.franciaflex.magalie.services.service.ArticleStorageService=TRACE

1 0