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

r271 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com July 1, 2013

July 1, 2013

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 July 1, 2013

July 1, 2013

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 July 1, 2013

July 1, 2013

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 July 1, 2013

July 1, 2013

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 July 1, 2013

July 1, 2013

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