branch master updated (3b3ed23 -> 2b01300)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git from 3b3ed23 [maven-release-plugin] copy for tag nuiton-web-1.17 adds b71a402 [maven-release-plugin] prepare for next development iteration adds cbfc988 fixes #3547: Migrates to git adds 1cdd412 fixes #3547: Migrates to git (site is only in fr) adds b6143b0 fixes #3547: Migrates to git (add missing site descriptors) adds 0213a5e fix site configuration adds 66a2f39 fixes #3563 [Nuiton-struts2] create an interceptor overriding ExecuteAndWaitInterceptor to copy the uploaded file adds 238196d add missing dependency + licenses adds ea2c21e Update gitignore adds 4bec087 fixes #3783: Remove winstone launcher (unmaintained) adds c5d7a62 Fix javadoc adds 306e10d Remove winstone adds 04536ee fixes #3782: Update to jetty 9 adds 9d05927 Fixes two runtime error in embedded mode adds 67c48b7 Migration vers gitlab + simplification configuration des sites adds 6c3c9bd fixes #3954: Update libs fixes #3953: Update topia 3.1.1 adds daeeca0 refs #3954: Update struts adds e20580b Update parent pom adds aa9e6a2 Fix build adds 90a6433 Fix build adds 92ffa8b Fix build adds 979c582 Fix build adds 3864b8f Fix build adds b120554 Fix build adds 5a6614e Update struts to 2.5.2 adds f9dc1e9 refs #3954: Update libs adds d5a5b30 refs #3954: Downgrade jetty to jdk 7 adds 5f72970 refs #3954: Update deps and fix build adds 3d5b57b fixes #4076: Remove unused modules adds 8a5bcbb refs #3954: Update dependencies adds f25bba5 [jgitflow-maven-plugin]updating poms for 1.18 branch with snapshot versions adds 56729f3 [jgitflow-maven-plugin]updating poms for branch'release/1.18' with non-snapshot versions adds 2b01300 [jgitflow-maven-plugin]merging 'release/1.18' into 'master' No new revisions were added by this update. Summary of changes: .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 | 25 +- .../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, 756 insertions(+), 1325 deletions(-) create mode 100644 .gitignore rename README.txt => README.md (100%) rename nuiton-tapestry/README.txt => nuiton-gwt/README.md (100%) delete mode 100644 nuiton-gwt/changelog.txt copy {nuiton-security => nuiton-gwt}/src/site/site.xml (50%) rename nuiton-web/README.txt => nuiton-rss/README.md (100%) delete mode 100644 nuiton-rss/README.txt delete mode 100644 nuiton-rss/changelog.txt copy {nuiton-security => nuiton-rss}/src/site/site.xml (50%) delete mode 100644 nuiton-rss/src/site/site_fr.xml rename nuiton-security/{changelog.txt => README.md} (100%) rename nuiton-struts2/{README.txt => README.md} (100%) delete mode 100644 nuiton-struts2/changelog.txt copy nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/TableModelListener.java => nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/HasUploadedFile.java (70%) create mode 100644 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/UploadExecuteAndWaitInterceptor.java copy {nuiton-security => nuiton-struts2}/src/site/site.xml (50%) delete mode 100644 nuiton-struts2/src/site/site_fr.xml rename nuiton-gwt/README.txt => nuiton-tapestry/README.md (100%) delete mode 100644 nuiton-tapestry/changelog.txt copy {nuiton-security => nuiton-tapestry}/src/site/site.xml (50%) rename nuiton-security/README.txt => nuiton-web/README.md (100%) delete mode 100644 nuiton-web/changelog.txt delete mode 100644 nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java rename nuiton-web/src/site/{site_fr.xml => site.xml} (51%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_fr.xml -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm