December 2011 - Nuiton-web-commits - mailman.cloud.codelutin.com

r153 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 02 Dec '11

02 Dec '11

Author: maven-release Date: 2011-12-02 15:42:26 +0100 (Fri, 02 Dec 2011) New Revision: 153 Url: http://nuiton.org/repositories/revision/nuiton-web/153 Log: [maven-release-plugin] prepare release nuiton-web-1.8 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/nuiton-gwt/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/nuiton-rss/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/nuiton-struts2/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/nuiton-tapestry/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/nuiton-web/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 17:16:59 UTC (rev 152) +++ trunk/pom.xml 2011-12-02 14:42:26 UTC (rev 153) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.8-SNAPSHOT</version> + <version>1.8</version> <modules> <module>nuiton-web</module> @@ -315,11 +315,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.8</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.8 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.8</url> </scm> <distributionManagement>

1 0

r152 - in trunk: nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib nuiton-struts2/src/main/resources/META-INF/tld nuiton-struts2/src/main/resources/template/css_xhtml nuiton-struts2/src/site nuiton-struts2/src/site/apt nuiton-web/src/main/java/org/nuiton/web/filter nuiton-web/src/main/java/org/nuiton/web/jmx
by athimel＠users.nuiton.org 01 Dec '11

01 Dec '11

Author: athimel Date: 2011-12-01 18:16:59 +0100 (Thu, 01 Dec 2011) New Revision: 152 Url: http://nuiton.org/repositories/revision/nuiton-web/152 Log: Add missing file headers Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl trunk/nuiton-struts2/src/site/apt/index.apt trunk/nuiton-struts2/src/site/apt/taglib.apt trunk/nuiton-struts2/src/site/site_fr.xml trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.struts2.taglib; import com.opensymphony.xwork2.util.ValueStack; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.struts2.taglib; import com.opensymphony.xwork2.util.ValueStack; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl 2011-12-01 17:16:59 UTC (rev 152) @@ -1 +1,25 @@ +<#-- + #%L + Nuiton Web :: Nuiton Struts 2 + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + 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. + + 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. + + 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>. + #L% +--> </div> \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +<#-- + #%L + Nuiton Web :: Nuiton Struts 2 + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + 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. + + 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. + + 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>. + #L% +--> <div id="idHelpKey${parameters.helpKey}">  <script type="text/javascript"> Property changes on: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/site/apt/index.apt =================================================================== --- trunk/nuiton-struts2/src/site/apt/index.apt 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/site/apt/index.apt 2011-12-01 17:16:59 UTC (rev 152) @@ -0,0 +1,24 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Struts 2 +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2010 - 2011 CodeLutin +~~ %% +~~ 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. +~~ +~~ 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. +~~ +~~ 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>. +~~ #L% +~~~ Property changes on: trunk/nuiton-struts2/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/site/apt/taglib.apt =================================================================== --- trunk/nuiton-struts2/src/site/apt/taglib.apt 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/site/apt/taglib.apt 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Struts 2 +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2010 - 2011 CodeLutin +~~ %% +~~ 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. +~~ +~~ 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. +~~ +~~ 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>. +~~ #L% +~~~ The ns:help tag Property changes on: trunk/nuiton-struts2/src/site/apt/taglib.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2011-12-01 17:16:59 UTC (rev 152) @@ -3,8 +3,8 @@ #%L Nuiton Utils :: Nuiton RSS - $Id: site_fr.xml 80 2011-06-28 12:25:30Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/nuiton-web/trunk/nuiton-rss/src/site/site_fr.xml $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin %% Property changes on: trunk/nuiton-struts2/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.filter; import org.apache.commons.logging.Log; Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.jmx; import java.io.Serializable; Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.jmx; import javax.servlet.FilterChain; Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java 2011-12-01 17:09:08 UTC (rev 151) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java 2011-12-01 17:16:59 UTC (rev 152) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package org.nuiton.web.jmx; import java.util.Map; Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r151 - trunk/nuiton-struts2/src/main/resources/template/css_xhtml
by athimel＠users.nuiton.org 01 Dec '11

01 Dec '11

Author: athimel Date: 2011-12-01 18:09:08 +0100 (Thu, 01 Dec 2011) New Revision: 151 Url: http://nuiton.org/repositories/revision/nuiton-web/151 Log: Evolution #1808 - Help tag now working Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-12-01 16:17:57 UTC (rev 150) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-12-01 17:09:08 UTC (rev 151) @@ -1,40 +1,38 @@ <div id="idHelpKey${parameters.helpKey}"> +  <script type="text/javascript"> $(document).ready( function() { var helpZone = $('#${parameters.helpZone}'); var initialHtml; + + function pushDocToHelpZone(docTitle, docContent) { + if (!docTitle && !docContent) { + hideHelp(); + } else { + var result = + "<dl>" + docTitle + "</dl>" + + "<dd>" + docContent + "</dd>"; + helpZone.html(result); + } + } + function showHelp() { initialHtml = helpZone.html(); - helpZone.html(getHelpAsHtml("${parameters.helpKey}")); + // User must define its own "pushHelpToHtml" method + pushHelpToHtml("${parameters.helpKey}", pushDocToHelpZone); } function hideHelp() { helpZone.html(initialHtml); } /* select, text, text areas and password fields */ - $('#idHelpKey${parameters.helpKey} input').focus( - function() { - showHelp(); - } - ); - $('#idHelpKey${parameters.helpKey} input').blur( - function() { - hideHelp(); - } - ); + $('#idHelpKey${parameters.helpKey} input, #idHelpKey${parameters.helpKey} select').focus(showHelp); + $('#idHelpKey${parameters.helpKey} input, #idHelpKey${parameters.helpKey} select').blur(hideHelp); /* radio buttons, check-boxes */ var fieldsNeedingHelpWhenMouseOver = - $('#idHelpKey${parameters.helpKey} input[type=radio], #idHelpKey${parameters.helpKey} input[type=checkbox], #idHelpKey${parameters.helpKey} input[type=submit], #idHelpKey${parameters.helpKey} label'); - fieldsNeedingHelpWhenMouseOver.mouseover( - function() { - showHelp(); - } - ); - fieldsNeedingHelpWhenMouseOver.mouseout( - function() { - hideHelp(); - } - ); + $('#idHelpKey${parameters.helpKey} input[type=radio], #idHelpKey${parameters.helpKey} input[type=checkbox], #idHelpKey${parameters.helpKey} input[type=submit], #idHelpKey${parameters.helpKey} label, #idHelpKey${parameters.helpKey} select'); + fieldsNeedingHelpWhenMouseOver.mouseover(showHelp); + fieldsNeedingHelpWhenMouseOver.mouseout(hideHelp); }); </script> \ No newline at end of file

1 0

r150 - in trunk/nuiton-web/src/main/java/org/nuiton/web: . filter jmx
by bleny＠users.nuiton.org 01 Dec '11

01 Dec '11

Author: bleny Date: 2011-12-01 17:17:57 +0100 (Thu, 01 Dec 2011) New Revision: 150 Url: http://nuiton.org/repositories/revision/nuiton-web/150 Log: #1841 Add a filter to gather stats on computation time for all application pages on a per page basis Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/MonitoringFilter.java 2011-12-01 16:17:57 UTC (rev 150) @@ -0,0 +1,90 @@ +package org.nuiton.web.filter; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.web.jmx.ServletStatisticsService; + +import javax.management.InstanceAlreadyExistsException; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanRegistrationException; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.NotCompliantMBeanException; +import javax.management.ObjectName; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; +import java.lang.management.ManagementFactory; + +/** + * Monitoring filter is a simple non-intrusive servlet filter that collect + * statistics about page computing time per request URI. + * + * All gathered data are published using JMX Bean to make it available through + * monitoring tools such as jconsole. + * + * @since 1.8 + */ +public class MonitoringFilter implements Filter { + + /** Logger. */ + private static final Log log = LogFactory.getLog(MonitoringFilter.class); + + protected ObjectName servletStatisticsMBeanName; + + protected ServletStatisticsService servletStatisticsService; + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + try { + MBeanServer server = ManagementFactory.getPlatformMBeanServer(); + // MBean implementation + servletStatisticsService = new ServletStatisticsService(); + // Bind the stats to a SessionFactory + // Register the Mbean on the server + servletStatisticsMBeanName = new ObjectName("Servlet:application=Statistics"); + server.registerMBean(servletStatisticsService, servletStatisticsMBeanName); + log.info("mbean " + servletStatisticsService + " attached as " + servletStatisticsMBeanName); + } catch (MalformedObjectNameException e) { + log.error("unable to register mbean", e); + } catch (InstanceAlreadyExistsException e) { + log.error("unable to register mbean", e); + } catch (MBeanRegistrationException e) { + log.error("unable to register mbean", e); + } catch (NotCompliantMBeanException e) { + log.error("unable to register mbean", e); + } + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + + servletStatisticsService.preFilter(servletRequest, servletResponse, filterChain); + + filterChain.doFilter(servletRequest, servletResponse); + + servletStatisticsService.postFilter(servletRequest, servletResponse, filterChain); + + } + + @Override + public void destroy() { + + log.info("statistics:\n" + servletStatisticsService.toCsv()); + + try { + MBeanServer server = ManagementFactory.getPlatformMBeanServer(); + server.unregisterMBean(servletStatisticsMBeanName); + log.info("mbean detached " + servletStatisticsMBeanName); + } catch (InstanceNotFoundException e) { + log.error("unable to unregister mbean", e); + } catch (MBeanRegistrationException e) { + log.error("unable to unregister mbean", e); + } + } + +} Added: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/RequestStatistics.java 2011-12-01 16:17:57 UTC (rev 150) @@ -0,0 +1,56 @@ +package org.nuiton.web.jmx; + +import java.io.Serializable; + +public class RequestStatistics implements Serializable { + + protected int count; + + protected long elapsedSum; + + protected long lowestElapsed = Long.MAX_VALUE; + + protected long highestElapsed; + + public int getCount() { + return count; + } + + public long getElapsedSum() { + return elapsedSum; + } + + public long getLowestElapsed() { + return lowestElapsed; + } + + public long getHighestElapsed() { + return highestElapsed; + } + + public long getAverageElapsed() { + return elapsedSum / count; + } + + public void count(long start, long stop) { + count += 1; + long elapsed = stop - start; + elapsedSum += elapsed; + if (elapsed < lowestElapsed) { + lowestElapsed = elapsed; + } + if (elapsed > highestElapsed) { + highestElapsed = elapsed; + } + } + + @Override + public String toString() { + return "count=" + count + + ", elapsedSum=" + elapsedSum + + ", lowestElapsed=" + lowestElapsed + + ", highestElapsed=" + highestElapsed + + ", averageElapsed=" + getAverageElapsed() + + '}'; + } +} Added: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsService.java 2011-12-01 16:17:57 UTC (rev 150) @@ -0,0 +1,80 @@ +package org.nuiton.web.jmx; + +import javax.servlet.FilterChain; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; + +/** Implementation of {@link ServletStatisticsServiceMBean}. + * + * + */ +public class ServletStatisticsService implements ServletStatisticsServiceMBean { + + protected Map<ServletRequest, Long> requestStartTime = + new HashMap<ServletRequest, Long>(); + + protected Map<String, RequestStatistics> perRequestStatistics = + new HashMap<String, RequestStatistics>(); + + public void preFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) { + + long start = System.currentTimeMillis(); + + requestStartTime.put(servletRequest, start); + + } + + public void postFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) { + + String contentType = servletResponse.getContentType(); + + if (contentType != null && contentType.startsWith("text/html")) { + + long stop = System.currentTimeMillis(); + + long start = requestStartTime.get(servletRequest); + + if (servletRequest instanceof HttpServletRequest) { + String requestURI = ((HttpServletRequest) servletRequest).getRequestURI(); + RequestStatistics requestStatistics = + (RequestStatistics) perRequestStatistics.get(requestURI); + if (requestStatistics == null) { + requestStatistics = new RequestStatistics(); + perRequestStatistics.put(requestURI, requestStatistics); + } + requestStatistics.count(start, stop); + } + } + + requestStartTime.remove(servletRequest); + } + + public Map<String, RequestStatistics> getPerRequestStatistics() { + return perRequestStatistics; + } + + @Override + public String toCsv() { + StringBuilder csv = new StringBuilder(); + csv.append("PAGE,NOMBRE_DEMANDES,DUREE_TOTALE,DUREE_MOYENNE,DUREE_MIN,DUREE_MAX\n"); + for (Map.Entry<String, RequestStatistics> requestStatistics : perRequestStatistics.entrySet()) { + String request = requestStatistics.getKey(); + RequestStatistics statistics = requestStatistics.getValue(); + csv.append(request).append(',') + .append(statistics.getCount()).append(',') + .append(statistics.getElapsedSum()).append(',') + .append(statistics.getAverageElapsed()).append(',') + .append(statistics.getLowestElapsed()).append(',') + .append(statistics.getHighestElapsed()).append('\n'); + } + return csv.toString(); + } + + @Override + public void reset() { + perRequestStatistics.clear(); + } +} Added: trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/jmx/ServletStatisticsServiceMBean.java 2011-12-01 16:17:57 UTC (rev 150) @@ -0,0 +1,12 @@ +package org.nuiton.web.jmx; + +import java.util.Map; + +public interface ServletStatisticsServiceMBean { + + Map<String, RequestStatistics> getPerRequestStatistics(); + + void reset(); + + String toCsv(); +}

1 0

r149 - in trunk/nuiton-struts2/src: . main/java/org/nuiton/web/struts2/taglib site site/apt
by bleny＠users.nuiton.org 01 Dec '11

01 Dec '11

Author: bleny Date: 2011-12-01 14:54:58 +0100 (Thu, 01 Dec 2011) New Revision: 149 Url: http://nuiton.org/repositories/revision/nuiton-web/149 Log: documentation for helptag Added: trunk/nuiton-struts2/src/site/ trunk/nuiton-struts2/src/site/apt/ trunk/nuiton-struts2/src/site/apt/index.apt trunk/nuiton-struts2/src/site/apt/taglib.apt trunk/nuiton-struts2/src/site/site_fr.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-11-28 22:21:46 UTC (rev 148) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-12-01 13:54:58 UTC (rev 149) @@ -8,6 +8,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +/** + * @since 1.7 + */ public class HelpTag extends AbstractClosingTag { /** Logger. */ Added: trunk/nuiton-struts2/src/site/apt/taglib.apt =================================================================== --- trunk/nuiton-struts2/src/site/apt/taglib.apt (rev 0) +++ trunk/nuiton-struts2/src/site/apt/taglib.apt 2011-12-01 13:54:58 UTC (rev 149) @@ -0,0 +1,94 @@ + +The ns:help tag + +* Abstract + + The ns:help tag allow you to enhance your forms by adding on them + extra-informations (such a tooltip) + + It may be helpful if you want your application to include to inline + help, gathering data from an aside user documentation. + +* Usage + + Let's say you have a simple form: + +------------------------------------------------ +<s:form ...> + + <s:textfield name="userName" /> + + <s:textfield name="password" /> + +</s:form> +------------------------------------------------ + + Now, you want to make your form given the user helpful information about how + she can fill the field. + +------------------------------------------------ +<s:form ...> + + <ns:help helpKey="userName"> + <s:textfield name="userName" /> + </ns:help> + + <ns:help helpKey="password"> + <s:textfield name="password" /> + </ns:help> + +</s:form> +------------------------------------------------ + + But first of all, you muste define two things : + + * A place where the help will appear, it must have the id "helpZone" + + * A handler function called "getHelpAsHtml" returning the html that should be + printed to the user. It can either call a Json action that will use a + text provider and a bundle where the help message for each helpKey is stored + + +------------------------------------------------ +<div id="helpZone"> + Here will appear your help message +</div> +------------------------------------------------ + +------------------------------------------------ +<script type="text/javascript"> + function getHelpAsHtml(helpKey) { + return "Ici, l'aide pour la clé '" + helpKey + "'"; + } +</script> +------------------------------------------------ + + You can surround more than one field with ns:help, all the fields will display + the help message. Instead of + +------------------------------------------------ +<s:form ...> + + <ns:help helpKey="loginHelp"> + <s:textfield name="userName" /> + </ns:help> + + <ns:help helpKey="loginHelp"> + <s:textfield name="password" /> + </ns:help> + +</s:form> +------------------------------------------------ + + You can just + +------------------------------------------------ +<s:form ...> + + <ns:help helpKey="loginHelp"> + <s:textfield name="userName" /> + <s:textfield name="password" /> + </ns:help> + +</s:form> +------------------------------------------------ Added: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml (rev 0) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2011-12-01 13:54:58 UTC (rev 149) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Nuiton taglib" href="taglib.html"/> + </menu> + + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0