This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 2b013003ed890931484dd161b517044626bacbef Merge: 3b3ed23 56729f3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 19:03:52 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.18' into 'master' .gitignore | 17 ++ README.txt => README.md | 0 nuiton-tapestry/README.txt => nuiton-gwt/README.md | 0 nuiton-gwt/changelog.txt | 2 - nuiton-gwt/pom.xml | 23 +- .../main/java/org/nuiton/web/gwt/NuitonGWT.gwt.xml | 2 +- .../web/gwt/comparable/ComparableAnchor.java | 2 +- .../org/nuiton/web/gwt/messages/UIMessages.java | 2 +- .../java/org/nuiton/web/gwt/misc/BlindedPopup.java | 10 +- .../web/gwt/table/SortableFlexTableWithModel.java | 2 +- {nuiton-security => nuiton-gwt}/src/site/site.xml | 37 ++- nuiton-web/README.txt => nuiton-rss/README.md | 0 nuiton-rss/README.txt | 0 nuiton-rss/changelog.txt | 2 - nuiton-rss/pom.xml | 14 +- nuiton-rss/src/license/THIRD-PARTY.properties | 9 +- .../src/main/java/org/nuiton/rss/BaseServlet.java | 7 +- .../java/org/nuiton/rss/ConfigInitializer.java | 5 +- .../src/main/java/org/nuiton/rss/FeedData.java | 5 +- .../java/org/nuiton/rss/FeedEntryComparator.java | 5 +- .../main/java/org/nuiton/rss/FeedHTMLRenderer.java | 5 +- .../src/main/java/org/nuiton/rss/FeedRenderer.java | 5 +- .../java/org/nuiton/rss/FeedRendererConfig.java | 20 +- .../src/main/java/org/nuiton/rss/FeedType.java | 7 +- .../main/java/org/nuiton/rss/FeedURLResolver.java | 5 +- nuiton-rss/src/main/java/org/nuiton/rss/Field.java | 5 +- .../src/main/java/org/nuiton/rss/HTMLCleaner.java | 5 +- .../java/org/nuiton/rss/HTMLScriptCleaner.java | 7 +- .../src/main/java/org/nuiton/rss/RSSConfig.java | 5 +- .../src/main/java/org/nuiton/rss/RSSGenerator.java | 9 +- .../java/org/nuiton/rss/RSSGeneratorConfig.java | 5 +- .../java/org/nuiton/rss/RSSGeneratorServlet.java | 7 +- .../src/main/java/org/nuiton/rss/RSSHelper.java | 12 +- .../src/main/java/org/nuiton/rss/RSSIOUtil.java | 5 +- .../src/main/java/org/nuiton/rss/RSSServlet.java | 20 +- .../java/org/nuiton/rss/SimpleFeedURLResolver.java | 5 +- .../editor/plugins/rssinclude/fck_rssinclude.html | 5 +- .../editor/plugins/rssinclude/fck_rssinclude.js | 3 - .../editor/plugins/rssinclude/fckplugin.js | 3 - .../fckeditor/editor/plugins/rssinclude/lang/en.js | 3 - .../fckeditor/editor/plugins/rssinclude/lang/fr.js | 3 - nuiton-rss/src/main/resources/log4j.properties | 5 +- nuiton-rss/src/main/webapp/WEB-INF/web.xml | 5 +- nuiton-rss/src/main/webapp/feed.css | 5 +- nuiton-rss/src/main/webapp/index.html | 5 +- nuiton-rss/src/main/webapp/rssgenerator.js | 3 - nuiton-rss/src/main/webapp/rssinclude.js | 3 - nuiton-rss/src/main/webapp/testFck.html | 5 +- nuiton-rss/src/main/webapp/testGenerator.html | 5 +- nuiton-rss/src/main/webapp/testRender.html | 5 +- nuiton-rss/src/site/apt/index.apt | 7 +- {nuiton-security => nuiton-rss}/src/site/site.xml | 27 +- nuiton-rss/src/site/site_fr.xml | 82 ------ .../org/nuiton/rss/RSSGeneratorHelperTest.java | 5 +- .../src/test/java/org/nuiton/rss/RSSTest.java | 5 +- nuiton-rss/src/test/resources/log4j.properties | 5 +- nuiton-security/{changelog.txt => README.md} | 0 nuiton-security/pom.xml | 31 ++- nuiton-security/src/license/THIRD-PARTY.properties | 20 +- .../nuiton/web/security/SecurityShiroFilter.java | 19 +- .../web/security/SecuritySubjectFactory.java | 2 - .../java/org/nuiton/web/security/SecurityUtil.java | 2 - .../nuiton/web/security/TopiaSecurityRealm.java | 6 +- .../org/nuiton/web/security/TopiaWebSubject.java | 2 - .../web/security/actions/AbstractAction.java | 2 - .../nuiton/web/security/actions/LoginAction.java | 2 - .../nuiton/web/security/actions/LogoutAction.java | 2 - .../nuiton/web/security/actions/RoleAction.java | 2 - .../security/actions/RolePermissionsAction.java | 2 - .../nuiton/web/security/actions/UserAction.java | 2 - .../web/security/actions/UserRolesAction.java | 2 - .../src/main/resources/WEB-INF/security/login.jsp | 2 - .../WEB-INF/security/role-permissions.jsp | 6 +- .../src/main/resources/WEB-INF/security/role.jsp | 2 - .../main/resources/WEB-INF/security/user-roles.jsp | 2 - .../src/main/resources/WEB-INF/security/user.jsp | 2 - nuiton-security/src/main/resources/struts.xml | 2 - nuiton-security/src/main/xmi/security.properties | 2 - nuiton-security/src/site/apt/index.apt | 5 +- nuiton-security/src/site/site.xml | 5 +- nuiton-struts2/{README.txt => README.md} | 0 nuiton-struts2/changelog.txt | 2 - nuiton-struts2/pom.xml | 35 ++- nuiton-struts2/src/license/THIRD-PARTY.properties | 22 +- .../java/org/nuiton/web/struts2/BaseAction.java | 5 +- .../org/nuiton/web/struts2/I18nTextProvider.java | 5 +- .../web/struts2/converters/DoubleConverter.java | 6 +- .../converters/HundredthLocalNumberConverter.java | 2 - .../web/struts2/converters/JsonConverter.java | 6 +- .../struts2/converters/LocalNumberConverter.java | 10 +- .../filter/CloseTopiaTransactionFilter.java | 3 - .../web/struts2/interceptor/HasUploadedFile.java | 28 +- .../OpenTopiaTransactionInterceptor.java | 29 +- .../UploadExecuteAndWaitInterceptor.java | 82 ++++++ .../org/nuiton/web/struts2/taglib/FieldError2.java | 27 +- .../nuiton/web/struts2/taglib/FieldError2Tag.java | 3 - .../org/nuiton/web/struts2/taglib/HelpBean.java | 3 - .../org/nuiton/web/struts2/taglib/HelpTag.java | 3 - .../resources/template/css_xhtml/help-close.ftl | 5 +- .../src/main/resources/template/css_xhtml/help.ftl | 5 +- .../template/css_xhtml/mycheckboxlist.ftl | 3 - .../resources/template/simple/mycheckboxlist.ftl | 5 +- nuiton-struts2/src/site/apt/index.apt | 3 - nuiton-struts2/src/site/apt/taglib.apt | 3 - .../src/site/site.xml | 28 +- nuiton-struts2/src/site/site_fr.xml | 82 ------ .../nuiton/web/struts2/I18nTextProviderTest.java | 8 +- .../converters/LocalNumberConverterTest.java | 4 +- .../resources/META-INF/toto-definition.properties | 3 - .../test/resources/META-INF/toto_fr_FR.properties | 5 +- nuiton-gwt/README.txt => nuiton-tapestry/README.md | 0 nuiton-tapestry/changelog.txt | 2 - nuiton-tapestry/pom.xml | 27 +- .../annotations/RequiresAuthentication.java | 5 +- .../nuiton/web/tapestry5/components/FeedBack.java | 9 +- .../web/tapestry5/components/SubmitContext.java | 2 +- .../data/AbstractMappedGridDataSource.java | 13 +- .../org/nuiton/web/tapestry5/mixins/Confirm.java | 3 - .../nuiton/web/tapestry5/mixins/ZoneUpdater.java | 3 - .../services/AbstractAuthenticationFilter.java | 5 +- .../web/tapestry5/services/FormatBinding.java | 5 +- .../tapestry5/services/FormatBindingFactory.java | 9 +- .../web/tapestry5/services/NuitonModule.java | 5 +- .../tapestry5/services/ServiceAuthentication.java | 34 ++- .../services/ServiceAuthenticationImpl.java | 15 +- .../web/tapestry5/services/package-info.java | 5 +- .../nuiton/web/tapestry5/components/feedback.css | 5 +- .../org/nuiton/web/tapestry5/mixins/confirm.js | 5 +- .../org/nuiton/web/tapestry5/mixins/zoneUpdater.js | 5 +- .../src/site/site.xml | 37 ++- nuiton-security/README.txt => nuiton-web/README.md | 0 nuiton-web/changelog.txt | 2 - nuiton-web/pom.xml | 37 ++- nuiton-web/src/license/THIRD-PARTY.properties | 16 +- .../nuiton/web/filter/JpaTransactionFilter.java | 20 +- .../org/nuiton/web/filter/MonitoringFilter.java | 3 - .../nuiton/web/filter/TopiaTransactionFilter.java | 5 +- .../web/filter/TypedTopiaTransactionFilter.java | 21 +- .../java/org/nuiton/web/jmx/RequestStatistics.java | 3 - .../nuiton/web/jmx/ServletStatisticsService.java | 3 - .../web/jmx/ServletStatisticsServiceMBean.java | 3 - .../java/org/nuiton/web/war/JettyLauncher.java | 27 +- .../java/org/nuiton/web/war/WinstoneLauncher.java | 294 --------------------- .../main/java/org/nuiton/web/war/package-info.java | 4 - nuiton-web/src/site/apt/TopiaFilter.apt.vm | 2 +- nuiton-web/src/site/apt/index.apt | 3 - nuiton-web/src/site/{site_fr.xml => site.xml} | 40 +-- pom.xml | 217 +++++++-------- src/site/apt/index.apt | 5 +- src/site/site.xml | 68 +++++ src/site/site_fr.xml | 108 -------- 151 files changed, 757 insertions(+), 1327 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.