Console Output
+ git merge --ff appng-1.19.x --strategy-option theirs
Auto-merging changelog.txt
Removing appng-tomcat8/src/main/java/org/appng/core/controller/Tomcat8Support.java
Removing appng-tomcat8/pom.xml
Removing appng-tomcat8/.gitignore
Removing appng-tomcat7/src/main/java/org/appng/core/controller/Tomcat7Support.java
Removing appng-tomcat7/pom.xml
Removing appng-tomcat7/.gitignore
Removing appng-core/src/test/resources/platformContext.xml
Removing appng-application/src/main/webapp/WEB-INF/conf/platformContext.xml
Auto-merging README.adoc
Merge made by the 'recursive' strategy.
Jenkinsfile | 8 +-
README.adoc | 22 +-
appng-api/pom.xml | 2 +-
.../main/java/org/appng/api/ActionProvider.java | 2 +-
.../org/appng/api/ApplicationConfigProvider.java | 2 +-
.../java/org/appng/api/ApplicationController.java | 2 +-
.../java/org/appng/api/ApplicationException.java | 2 +-
.../java/org/appng/api/AttachmentWebservice.java | 2 +-
.../main/java/org/appng/api/BusinessException.java | 2 +-
.../src/main/java/org/appng/api/DataContainer.java | 2 +-
.../src/main/java/org/appng/api/DataProvider.java | 2 +-
.../src/main/java/org/appng/api/Environment.java | 2 +-
.../main/java/org/appng/api/FieldConverter.java | 4 +-
.../main/java/org/appng/api/FieldProcessor.java | 2 +-
.../src/main/java/org/appng/api/FieldWrapper.java | 4 +-
.../src/main/java/org/appng/api/FileUpload.java | 2 +-
.../main/java/org/appng/api/FormDataBinder.java | 2 +-
.../java/org/appng/api/FormProcessProvider.java | 2 +-
.../src/main/java/org/appng/api/FormValidator.java | 2 +-
.../src/main/java/org/appng/api/GlobalTaglet.java | 2 +-
.../main/java/org/appng/api/GlobalXMLTaglet.java | 2 +-
.../appng/api/InvalidConfigurationException.java | 2 +-
.../src/main/java/org/appng/api/MessageParam.java | 2 +-
.../src/main/java/org/appng/api/NotBlank.java | 2 +-
appng-api/src/main/java/org/appng/api/Option.java | 2 +-
appng-api/src/main/java/org/appng/api/Options.java | 2 +-
.../src/main/java/org/appng/api/PageProcessor.java | 2 +-
.../main/java/org/appng/api/ParameterSupport.java | 2 +-
appng-api/src/main/java/org/appng/api/Path.java | 2 +-
.../src/main/java/org/appng/api/PathInfo.java | 8 +-
.../main/java/org/appng/api/PermissionOwner.java | 4 +-
.../java/org/appng/api/PermissionProcessor.java | 2 +-
.../src/main/java/org/appng/api/Platform.java | 5 +-
.../java/org/appng/api/ProcessingException.java | 2 +-
appng-api/src/main/java/org/appng/api/Request.java | 2 +-
.../main/java/org/appng/api/RequestDataBinder.java | 2 +-
.../main/java/org/appng/api/RequestSupport.java | 2 +-
.../src/main/java/org/appng/api/RequestUtil.java | 17 +-
.../src/main/java/org/appng/api/ResultService.java | 2 +-
.../src/main/java/org/appng/api/ScheduledJob.java | 2 +-
.../java/org/appng/api/ScheduledJobResult.java | 15 +
appng-api/src/main/java/org/appng/api/Scope.java | 2 +-
appng-api/src/main/java/org/appng/api/Session.java | 2 +-
.../main/java/org/appng/api/SiteProperties.java | 12 +-
.../src/main/java/org/appng/api/SoapClient.java | 4 +-
.../src/main/java/org/appng/api/SoapService.java | 2 +-
appng-api/src/main/java/org/appng/api/Taglet.java | 2 +-
.../src/main/java/org/appng/api/VHostMode.java | 2 +-
.../java/org/appng/api/ValidationMessages.java | 2 +-
.../java/org/appng/api/ValidationProvider.java | 2 +-
.../src/main/java/org/appng/api/Webservice.java | 2 +-
.../src/main/java/org/appng/api/XMLTaglet.java | 2 +-
.../main/java/org/appng/api/XPathProcessor.java | 19 +-
.../main/java/org/appng/api/auth/AuthTools.java | 10 +-
.../java/org/appng/api/auth/PasswordPolicy.java | 2 +-
.../main/java/org/appng/api/messaging/Event.java | 2 +-
.../java/org/appng/api/messaging/EventHandler.java | 2 +-
.../org/appng/api/messaging/EventRegistry.java | 4 +-
.../java/org/appng/api/messaging/Messaging.java | 11 +-
.../java/org/appng/api/messaging/Receiver.java | 2 +-
.../main/java/org/appng/api/messaging/Sender.java | 2 +-
.../java/org/appng/api/messaging/Serializer.java | 8 +-
.../src/main/java/org/appng/api/model/Account.java | 2 +-
.../main/java/org/appng/api/model/Application.java | 2 +-
.../org/appng/api/model/ApplicationSubject.java | 2 +-
.../main/java/org/appng/api/model/AuthSubject.java | 2 +-
.../java/org/appng/api/model/Authorizable.java | 2 +-
.../java/org/appng/api/model/FeatureProvider.java | 2 +-
.../src/main/java/org/appng/api/model/Group.java | 2 +-
.../java/org/appng/api/model/Identifiable.java | 2 +-
.../main/java/org/appng/api/model/Identifier.java | 2 +-
.../java/org/appng/api/model/NameProvider.java | 2 +-
.../main/java/org/appng/api/model/Nameable.java | 2 +-
.../src/main/java/org/appng/api/model/Named.java | 2 +-
.../main/java/org/appng/api/model/Permission.java | 2 +-
.../main/java/org/appng/api/model/Properties.java | 2 +-
.../main/java/org/appng/api/model/Property.java | 2 +-
.../main/java/org/appng/api/model/Resource.java | 2 +-
.../java/org/appng/api/model/ResourceType.java | 4 +-
.../main/java/org/appng/api/model/Resources.java | 2 +-
.../org/appng/api/model/ReverseableComparator.java | 2 +-
.../java/org/appng/api/model/RevisionAware.java | 2 +-
.../src/main/java/org/appng/api/model/Role.java | 2 +-
.../java/org/appng/api/model/SimpleProperty.java | 17 +-
.../src/main/java/org/appng/api/model/Site.java | 2 +-
.../src/main/java/org/appng/api/model/Subject.java | 2 +-
.../main/java/org/appng/api/model/UserType.java | 2 +-
.../main/java/org/appng/api/model/Versionable.java | 2 +-
.../java/org/appng/api/observe/Observable.java | 5 +-
.../main/java/org/appng/api/observe/Observer.java | 2 +-
.../appng/api/observe/impl/ObservableDelegate.java | 2 +-
.../appng/api/search/BlockingQueueAccessor.java | 2 +-
.../main/java/org/appng/api/search/Consumer.java | 2 +-
.../main/java/org/appng/api/search/Document.java | 2 +-
.../java/org/appng/api/search/DocumentEvent.java | 2 +-
.../org/appng/api/search/DocumentProducer.java | 2 +-
.../main/java/org/appng/api/search/Producer.java | 2 +-
.../java/org/appng/api/support/AdapterBase.java | 2 +-
.../api/support/ApplicationConfigProviderImpl.java | 55 +-
.../org/appng/api/support/ApplicationRequest.java | 2 +-
.../api/support/ApplicationResourceHolder.java | 30 +-
.../java/org/appng/api/support/CallableAction.java | 73 +--
.../org/appng/api/support/CallableDataSource.java | 28 +-
.../java/org/appng/api/support/ClassWrapper.java | 2 +-
.../appng/api/support/ConfigValidationError.java | 2 +-
.../org/appng/api/support/ConfigValidator.java | 56 +-
.../api/support/DatasourceInheritanceHelper.java | 43 +-
.../api/support/DefaultPermissionProcessor.java | 42 +-
.../appng/api/support/DollarParameterSupport.java | 2 +-
.../api/support/DummyPermissionProcessor.java | 13 +-
.../java/org/appng/api/support/ElementHelper.java | 25 +-
.../org/appng/api/support/FieldProcessorImpl.java | 22 +-
.../appng/api/support/HashParameterSupport.java | 2 +-
.../org/appng/api/support/HttpHeaderUtils.java | 27 +-
.../src/main/java/org/appng/api/support/I18n.java | 2 +-
.../java/org/appng/api/support/LabelSupport.java | 84 +--
.../org/appng/api/support/MessageSourceChain.java | 2 +-
.../java/org/appng/api/support/OptionFactory.java | 8 +-
.../org/appng/api/support/OptionGroupFactory.java | 2 +-
.../java/org/appng/api/support/OptionImpl.java | 4 +-
.../java/org/appng/api/support/OptionOwner.java | 2 +-
.../java/org/appng/api/support/OptionsBuilder.java | 2 +-
.../java/org/appng/api/support/OptionsImpl.java | 4 +-
.../appng/api/support/ParameterSupportBase.java | 6 +-
.../org/appng/api/support/PositionalXMLReader.java | 2 +-
.../java/org/appng/api/support/PropertyHolder.java | 6 +-
.../org/appng/api/support/RequestFactoryBean.java | 26 +-
.../org/appng/api/support/RequestSupportImpl.java | 29 +-
.../api/support/ResourceBundleMessageSource.java | 4 +-
.../org/appng/api/support/ResultServiceImpl.java | 4 +-
.../org/appng/api/support/SelectionBuilder.java | 2 +-
.../org/appng/api/support/SelectionFactory.java | 2 +-
.../api/support/SiteAwareObjectInputStream.java | 2 +-
.../org/appng/api/support/SiteClassLoader.java | 8 +-
.../org/appng/api/support/SortParamSupport.java | 10 +-
.../main/java/org/appng/api/support/XSSHelper.java | 2 +-
.../java/org/appng/api/support/XmlGenerator.java | 22 +-
.../support/environment/AbstractEnvironment.java | 2 +-
.../api/support/environment/AttributeWrapper.java | 2 +-
.../support/environment/DefaultEnvironment.java | 48 +-
.../environment/EnvironmentFactoryBean.java | 2 +-
.../api/support/environment/EnvironmentKeys.java | 11 +-
.../support/environment/PlatformEnvironment.java | 4 +-
.../support/environment/RequestEnvironment.java | 4 +-
.../api/support/environment/ScopedEnvironment.java | 2 +-
.../support/environment/SessionEnvironment.java | 4 +-
.../api/support/environment/SiteEnvironment.java | 2 +-
.../org/appng/api/support/field/ConverterBase.java | 2 +-
.../support/field/CoordinateFieldConverter.java | 10 +-
.../api/support/field/DateFieldConverter.java | 9 +-
.../api/support/field/DecimalFieldConverter.java | 9 +-
.../api/support/field/DefaultFieldConverter.java | 10 +-
.../api/support/field/FieldConversionFactory.java | 18 +-
.../api/support/field/FileFieldConverter.java | 10 +-
.../api/support/field/IntegerFieldConverter.java | 9 +-
.../api/support/field/LinkPanelFieldHandler.java | 9 +-
.../api/support/field/ListFieldConverter.java | 18 +-
.../api/support/field/NumberFieldConverter.java | 2 +-
.../api/support/field/ObjectFieldConverter.java | 14 +-
.../validation/DefaultValidationProvider.java | 28 +-
.../validation/FileUploadListValidator.java | 2 +-
.../support/validation/FileUploadValidator.java | 2 +-
.../validation/LocalizedMessageInterpolator.java | 16 +-
.../src/test/java/org/appng/api/AbstractTest.java | 14 +-
.../java/org/appng/api/ConfigValidatorTest.java | 6 +-
.../java/org/appng/api/ConsumerProducerTest.java | 2 +-
.../test/java/org/appng/api/DataContainerTest.java | 6 +-
.../test/java/org/appng/api/FileUploadTest.java | 2 +-
.../java/org/appng/api/FormDataBinderTest.java | 2 +-
.../test/java/org/appng/api/MetaDataProvider.java | 2 +-
appng-api/src/test/java/org/appng/api/Person.java | 12 +-
.../java/org/appng/api/RequestDataBinderTest.java | 2 +-
.../java/org/appng/api/XPathProcessorTest.java | 2 +-
.../java/org/appng/api/auth/AuthToolsTest.java | 2 +-
.../api/support/ApplicationResourceHolderTest.java | 47 ++
.../org/appng/api/support/CallableActionTest.java | 2 +-
.../appng/api/support/CallableDataSourceTest.java | 4 +-
.../api/support/DatasourceInheritanceTest.java | 56 +-
.../org/appng/api/support/ElementHelperTest.java | 44 +-
.../org/appng/api/support/FieldProcessorTest.java | 2 +-
.../org/appng/api/support/HttpHeaderUtilsTest.java | 2 +-
.../test/java/org/appng/api/support/I18nTest.java | 2 +-
.../org/appng/api/support/LabelSupportTest.java | 8 +-
.../appng/api/support/MessageSourceChainTest.java | 2 +-
.../java/org/appng/api/support/OptionData.java | 6 +-
.../java/org/appng/api/support/OptionImplTest.java | 2 +-
.../org/appng/api/support/OptionsImplTest.java | 2 +-
.../appng/api/support/ParameterSupportTest.java | 14 +-
.../org/appng/api/support/PropertyHolderTest.java | 4 +-
.../org/appng/api/support/RequestSupportTest.java | 6 +-
.../org/appng/api/support/ResultServiceTest.java | 12 +-
.../test/java/org/appng/api/support/ScopeTest.java | 2 +-
.../appng/api/support/SelectionBuilderTest.java | 2 +-
.../appng/api/support/SelectionFactoryTest.java | 6 +-
.../appng/api/support/SortParamSupportTest.java | 2 +-
.../appng/api/support/ValidationProviderTest.java | 2 +-
.../java/org/appng/api/support/XmlValidator.java | 2 +-
.../api/support/environment/EnvironmentTest.java | 15 +-
.../support/field/AbstractFieldConverterTest.java | 8 +-
.../field/DateFieldConverterDateTimeTest.java | 2 +-
.../api/support/field/DateFieldConverterTest.java | 2 +-
.../support/field/DefaultFieldConverterTest.java | 2 +-
.../api/support/field/FileFieldConverterTest.java | 6 +-
.../support/field/IntegerFieldConverterTest.java | 2 +-
.../support/field/LinkPanelFieldHandlerTest.java | 4 +-
.../api/support/field/ListFieldConverterTest.java | 4 +-
.../support/field/ObjectFieldConverterTest.java | 8 +-
.../validation/FileUploadValidatorTest.java | 2 +-
.../LocalizedMessageInterpolatorTest.java | 2 +-
appng-application-assembly/pom.xml | 2 +-
appng-application-bom/pom.xml | 304 ++++++----
appng-application-camunda/pom.xml | 2 +-
appng-application-parent/pom.xml | 2 +-
appng-application/README.adoc | 11 +-
appng-application/pom.xml | 12 +-
.../src/main/webapp/META-INF/context.xml | 2 +-
.../main/webapp/WEB-INF/conf/platformContext.xml | 153 -----
appng-application/src/main/webapp/WEB-INF/web.xml | 6 +-
appng-appngizer-jaxb/pom.xml | 8 +-
appng-appngizer-maven-plugin/pom.xml | 2 +-
.../maven/plugins/appngizer/AppNGizerMojo.java | 4 +-
.../appng/maven/plugins/appngizer/InstallMojo.java | 2 +-
.../appng/maven/plugins/appngizer/UploadMojo.java | 2 +-
.../maven/plugins/appngizer/AppNGizerMojoTest.java | 2 +-
appng-appngizer/pom.xml | 2 +-
.../org/appng/appngizer/controller/AppNGizer.java | 8 +-
.../appngizer/controller/AppNGizerConfigurer.java | 2 +-
.../appngizer/controller/AppNGizerServlet.java | 2 +-
.../controller/ApplicationController.java | 35 +-
.../appng/appngizer/controller/ControllerBase.java | 2 +-
.../appngizer/controller/DatabaseController.java | 25 +-
.../appngizer/controller/GroupController.java | 22 +-
.../java/org/appng/appngizer/controller/Home.java | 20 +-
.../appngizer/controller/Jaxb2Marshaller.java | 13 +-
.../appngizer/controller/PermissionController.java | 22 +-
.../appngizer/controller/PlatformController.java | 16 +-
.../controller/PlatformPropertyController.java | 20 +-
.../appng/appngizer/controller/PropertyBase.java | 4 +-
.../appngizer/controller/RepositoryController.java | 34 +-
.../appng/appngizer/controller/RoleController.java | 24 +-
.../appng/appngizer/controller/SessionFilter.java | 4 +-
.../controller/SiteApplicationController.java | 28 +-
.../SiteApplicationPropertyController.java | 20 +-
.../appng/appngizer/controller/SiteController.java | 28 +-
.../controller/SitePropertyController.java | 32 +-
.../appngizer/controller/SubjectController.java | 24 +-
.../org/appng/appngizer/model/Application.java | 2 +-
.../org/appng/appngizer/model/Applications.java | 2 +-
.../java/org/appng/appngizer/model/Database.java | 2 +-
.../java/org/appng/appngizer/model/Databases.java | 2 +-
.../main/java/org/appng/appngizer/model/Group.java | 2 +-
.../java/org/appng/appngizer/model/Groups.java | 2 +-
.../main/java/org/appng/appngizer/model/Home.java | 2 +-
.../main/java/org/appng/appngizer/model/Link.java | 2 +-
.../main/java/org/appng/appngizer/model/Links.java | 2 +-
.../java/org/appng/appngizer/model/Package.java | 2 +-
.../java/org/appng/appngizer/model/Packages.java | 2 +-
.../java/org/appng/appngizer/model/Permission.java | 2 +-
.../org/appng/appngizer/model/Permissions.java | 2 +-
.../java/org/appng/appngizer/model/Platform.java | 2 +-
.../java/org/appng/appngizer/model/Properties.java | 2 +-
.../java/org/appng/appngizer/model/Property.java | 2 +-
.../org/appng/appngizer/model/Repositories.java | 2 +-
.../java/org/appng/appngizer/model/Repository.java | 2 +-
.../main/java/org/appng/appngizer/model/Role.java | 2 +-
.../main/java/org/appng/appngizer/model/Roles.java | 2 +-
.../main/java/org/appng/appngizer/model/Site.java | 2 +-
.../main/java/org/appng/appngizer/model/Sites.java | 2 +-
.../java/org/appng/appngizer/model/Subject.java | 2 +-
.../java/org/appng/appngizer/model/Subjects.java | 2 +-
.../java/org/appng/appngizer/model/UriAware.java | 2 +-
.../controller/ApplicationControllerTest.java | 2 +-
.../ApplicationPropertyControllerTest.java | 2 +-
.../appng/appngizer/controller/ControllerTest.java | 7 +-
.../controller/DatabaseControllerTest.java | 2 +-
.../appngizer/controller/GroupControllerTest.java | 2 +-
.../controller/PermissionControllerTest.java | 2 +-
.../controller/PlatformPropertyControllerTest.java | 8 +-
.../controller/RepositoryControllerTest.java | 2 +-
.../appngizer/controller/RoleControllerTest.java | 2 +-
.../controller/SiteApplicationControllerTest.java | 2 +-
.../appngizer/controller/SiteControllerTest.java | 2 +-
.../controller/SitePropertyControllerTest.java | 2 +-
.../controller/SubjectControllerTest.java | 2 +-
.../test/resources/xml/database-init-managed.xml | 2 +-
.../src/test/resources/xml/database-init.xml | 2 +-
.../test/resources/xml/database-root-update.xml | 2 +-
.../test/resources/xml/platform-property-list.xml | 5 +
.../src/test/resources/xml/site-property-list.xml | 5 +
appng-archetype-application/pom.xml | 2 +-
appng-archetype-application/readme.txt | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
appng-camunda/pom.xml | 6 +-
.../java/org/appng/camunda/bpm/TaskWrapper.java | 2 +-
.../org/appng/camunda/bpm/TaskWrapperTest.java | 2 +-
appng-cli/pom.xml | 2 +-
.../src/main/java/org/appng/cli/CliBootstrap.java | 55 +-
.../org/appng/cli/CliBootstrapEnvironment.java | 2 +-
.../src/main/java/org/appng/cli/CliCommands.java | 4 +-
appng-cli/src/main/java/org/appng/cli/CliCore.java | 16 +-
.../main/java/org/appng/cli/CliEnvironment.java | 18 +-
.../main/java/org/appng/cli/CliEventProvider.java | 2 +-
.../src/main/java/org/appng/cli/CliShell.java | 2 +-
.../java/org/appng/cli/ExecutableCliCommand.java | 2 +-
.../org/appng/cli/NoSuchRepositoryException.java | 2 +-
.../java/org/appng/cli/NoSuchSiteException.java | 2 +-
.../java/org/appng/cli/commands/CommandBatch.java | 18 +-
.../java/org/appng/cli/commands/CommandList.java | 2 +-
.../java/org/appng/cli/commands/CommandMain.java | 6 +-
.../java/org/appng/cli/commands/FileOwner.java | 8 +-
.../commands/application/ActivateApplication.java | 2 +-
.../cli/commands/application/BaseApplication.java | 2 +-
.../application/DeactivateApplication.java | 2 +-
.../commands/application/DeleteApplication.java | 2 +-
.../commands/application/InstallApplication.java | 2 +-
.../cli/commands/application/ListApplications.java | 2 +-
.../cli/commands/applicationrole/AddRole.java | 2 +-
.../cli/commands/applicationrole/ListRoles.java | 2 +-
.../org/appng/cli/commands/group/AddGroup.java | 2 +-
.../org/appng/cli/commands/group/CreateGroup.java | 2 +-
.../org/appng/cli/commands/group/DeleteGroup.java | 2 +-
.../org/appng/cli/commands/group/ListGroups.java | 2 +-
.../appng/cli/commands/heartbeat/HeartBeat.java | 273 ++-------
.../cli/commands/permission/AddPermission.java | 2 +-
.../cli/commands/permission/ListPermissions.java | 4 +-
.../cli/commands/permission/RemovePermission.java | 2 +-
.../appng/cli/commands/platform/ExtractData.java | 225 ++++++++
.../cli/commands/property/CreateProperty.java | 2 +-
.../cli/commands/property/DeleteProperty.java | 2 +-
.../cli/commands/property/ListProperties.java | 2 +-
.../cli/commands/property/PropertyHelper.java | 2 +-
.../cli/commands/property/UpdateProperty.java | 2 +-
.../cli/commands/repository/CreateRepository.java | 2 +-
.../cli/commands/repository/DeleteRepository.java | 2 +-
.../cli/commands/repository/ListRepositories.java | 2 +-
.../appng/cli/commands/site/CheckSiteRunning.java | 2 +-
.../org/appng/cli/commands/site/CreateSite.java | 2 +-
.../org/appng/cli/commands/site/DeleteSite.java | 2 +-
.../org/appng/cli/commands/site/ListSites.java | 2 +-
.../org/appng/cli/commands/site/ReloadSite.java | 2 +-
.../org/appng/cli/commands/site/SetSiteActive.java | 2 +-
.../appng/cli/commands/subject/CreateSubject.java | 33 +-
.../appng/cli/commands/subject/DeleteSubject.java | 2 +-
.../appng/cli/commands/subject/HashPassword.java | 163 ++++++
.../appng/cli/commands/subject/ListSubjects.java | 2 +-
.../cli/commands/template/DeleteTemplate.java | 2 +-
.../cli/commands/template/InstallTemplate.java | 2 +-
.../org/appng/cli/prettytable/PrettyTable.java | 8 +-
.../org/appng/cli/prettytable/TableColumn.java | 2 +-
.../org/appng/cli/prettytable/TableConstants.java | 2 +-
.../java/org/appng/cli/prettytable/TableRow.java | 4 +-
.../org/appng/cli/servlet/InstallListener.java | 56 +-
.../java/org/appng/cli/validators/FileExists.java | 2 +-
appng-cli/src/main/resources/cliContext.xml | 4 +-
appng-cli/src/main/resources/context-resources.xml | 5 +
.../org/appng/cli/commands/platform/appng | 6 +
.../org/appng/cli/commands/platform/appng.bat | 6 +
.../java/org/appng/cli/CliBootstrapRunner.java | 28 +
.../test/java/org/appng/cli/CliBootstrapTest.java | 2 +-
.../org/appng/cli/CliCoreDBNotInitializedTest.java | 2 +-
.../src/test/java/org/appng/cli/CliCoreTest.java | 2 +-
.../appng/cli/commands/AbstractCommandTest.java | 2 +-
.../org/appng/cli/commands/CommandBatchTest.java | 4 +-
.../application/CommandInstallApplicationTest.java | 2 +-
.../CommandListApplicationsForSiteTest.java | 2 +-
.../application/CommandListApplicationsTest.java | 2 +-
.../cli/commands/group/CommandAddGroupTest.java | 2 +-
.../cli/commands/group/CommandCreateGroupTest.java | 2 +-
.../cli/commands/group/CommandDeleteGroupTest.java | 2 +-
.../cli/commands/group/CommandListGroupsTest.java | 2 +-
.../cli/commands/permission/AddPermissionTest.java | 2 +-
.../commands/permission/BasePermissionTest.java | 2 +-
.../commands/permission/ListPermissionTest.java | 2 +-
.../commands/permission/RemovePermissionTest.java | 2 +-
.../property/CommandCreateClobPropertyTest.java | 2 +-
.../property/CommandCreatePropertyTest.java | 2 +-
.../property/CommandListPropertiesTest.java | 9 +-
.../property/CommandUpdateClobPropertyTest.java | 2 +-
.../property/CommandUpdatePropertyTest.java | 2 +-
.../repository/CommandCreateRepositoryTest.java | 2 +-
.../repository/CommandDeleteRepositoryTest.java | 2 +-
.../repository/CommandListRepositoryTest.java | 2 +-
.../commands/site/CommandCheckSiteRunningTest.java | 2 +-
.../cli/commands/site/CommandCreateSiteTest.java | 2 +-
.../cli/commands/site/CommandDeleteSiteTest.java | 2 +-
.../cli/commands/site/CommandListSitesTest.java | 2 +-
.../commands/site/CommandSetSiteActiveTest.java | 2 +-
.../commands/subject/CommandCreateSubjectTest.java | 24 +-
.../commands/subject/CommandDeleteSubjectTest.java | 2 +-
.../commands/subject/CommandListSubjectTest.java | 2 +-
.../cli/commands/subject/HashPasswordTest.java | 47 ++
.../template/CommandInstallTemplateTest.java | 2 +-
.../org/appng/cli/prettyTable/PrettyTableTest.java | 2 +-
appng-cli/src/test/resources/cliContext-test.xml | 2 +
appng-core/pom.xml | 23 +-
.../src/main/java/org/appng/core/JMXUtils.java | 12 +-
.../src/main/java/org/appng/core/Redirect.java | 13 +-
.../java/org/appng/core/controller/AppngCache.java | 6 +-
.../appng/core/controller/CacheElementBase.java | 2 +-
.../java/org/appng/core/controller/Controller.java | 118 ++--
.../org/appng/core/controller/HttpHeaders.java | 2 +-
.../org/appng/core/controller/Log4jConfigurer.java | 67 +++
.../org/appng/core/controller/PlatformConfig.java | 242 ++++++++
.../org/appng/core/controller/PlatformStartup.java | 77 ++-
.../appng/core/controller/RepositoryWatcher.java | 27 +-
.../java/org/appng/core/controller/Session.java | 2 +-
.../org/appng/core/controller/SessionListener.java | 12 +-
.../core/controller/filter/CsrfSetupFilter.java | 32 +-
.../core/controller/filter/JspExtensionFilter.java | 26 +-
.../controller/filter/MSOfficeUserAgentFilter.java | 11 +-
.../core/controller/filter/PageCacheFilter.java | 23 +-
.../core/controller/filter/RedirectFilter.java | 28 +-
.../core/controller/filter/ResponseWrapper.java | 2 +-
.../appng/core/controller/filter/XSSFilter.java | 12 +-
.../core/controller/handler/ErrorPageHandler.java | 12 +-
.../appng/core/controller/handler/GuiHandler.java | 24 +-
.../appng/core/controller/handler/JspHandler.java | 15 +-
.../core/controller/handler/RequestHandler.java | 2 +-
.../appng/core/controller/handler/RestService.java | 8 +-
.../controller/handler/ServiceRequestHandler.java | 16 +-
.../appng/core/controller/handler/SoapService.java | 13 +-
.../controller/handler/StaticContentHandler.java | 11 +-
.../appng/core/controller/messaging/JedisBase.java | 2 +-
.../core/controller/messaging/JedisReceiver.java | 9 +-
.../core/controller/messaging/JedisSender.java | 11 +-
.../core/controller/messaging/MessageHandler.java | 2 +-
.../controller/messaging/MulticastReceiver.java | 17 +-
.../core/controller/messaging/MulticastSender.java | 32 +-
.../appng/core/controller/messaging/NodeEvent.java | 6 +-
.../core/controller/messaging/RabbitMQBase.java | 2 +-
.../controller/messaging/RabbitMQReceiver.java | 9 +-
.../core/controller/messaging/RabbitMQSender.java | 9 +-
.../core/controller/messaging/ReloadSiteEvent.java | 2 +-
.../controller/messaging/RequestNodeState.java | 2 +-
.../controller/messaging/SiteDeletedEvent.java | 2 +-
.../core/controller/messaging/SiteStateEvent.java | 4 +-
.../core/controller/messaging/TribesReceiver.java | 10 +-
.../core/controller/messaging/TribesSender.java | 10 +-
.../appng/core/controller/rest/RestActionBase.java | 99 ++--
.../core/controller/rest/RestDataSourceBase.java | 18 +-
.../appng/core/controller/rest/RestOperation.java | 13 +-
.../core/controller/rest/RestPostProcessor.java | 2 +-
.../org/appng/core/domain/ApplicationImpl.java | 18 +-
.../main/java/org/appng/core/domain/Auditable.java | 2 +-
.../org/appng/core/domain/DatabaseConnection.java | 9 +-
.../main/java/org/appng/core/domain/GroupImpl.java | 6 +-
.../java/org/appng/core/domain/ObjectUtils.java | 11 +-
.../org/appng/core/domain/PackageArchiveImpl.java | 21 +-
.../java/org/appng/core/domain/PermissionImpl.java | 2 +-
.../core/domain/PersistentPropertyHolder.java | 2 +-
.../java/org/appng/core/domain/PlatformEvent.java | 2 +-
.../appng/core/domain/PlatformEventListener.java | 12 +-
.../java/org/appng/core/domain/PropertyImpl.java | 2 +-
.../java/org/appng/core/domain/RepositoryImpl.java | 15 +-
.../java/org/appng/core/domain/ResourceImpl.java | 2 +-
.../main/java/org/appng/core/domain/RoleImpl.java | 4 +-
.../org/appng/core/domain/SiteApplication.java | 2 +-
.../org/appng/core/domain/SiteApplicationPK.java | 8 +-
.../main/java/org/appng/core/domain/SiteImpl.java | 24 +-
.../java/org/appng/core/domain/SubjectImpl.java | 6 +-
.../main/java/org/appng/core/domain/Template.java | 4 +-
.../org/appng/core/domain/TemplateResource.java | 2 +-
.../org/appng/core/domain/ValidationPatterns.java | 2 +-
.../appng/core/model/AbstractRequestProcessor.java | 85 ++-
.../appng/core/model/AccessibleApplication.java | 2 +-
.../java/org/appng/core/model/ActionElement.java | 2 +-
.../org/appng/core/model/ApplicationContext.java | 11 +-
.../org/appng/core/model/ApplicationProvider.java | 55 +-
.../appng/core/model/ApplicationSubjectImpl.java | 4 +-
.../java/org/appng/core/model/CacheProvider.java | 12 +-
.../org/appng/core/model/DataSourceElement.java | 2 +-
.../org/appng/core/model/FeatureProviderImpl.java | 2 +-
.../org/appng/core/model/InstallablePackage.java | 2 +-
.../main/java/org/appng/core/model/JarInfo.java | 10 +-
.../org/appng/core/model/NavigationBuilder.java | 21 +-
.../java/org/appng/core/model/PackageArchive.java | 2 +-
.../java/org/appng/core/model/PackageVersion.java | 2 +-
.../java/org/appng/core/model/PackageWrapper.java | 8 +-
.../appng/core/model/PageParameterProcessor.java | 25 +-
.../org/appng/core/model/PlatformProcessor.java | 98 ++--
.../org/appng/core/model/PlatformTransformer.java | 147 ++---
.../main/java/org/appng/core/model/Repository.java | 13 +-
.../java/org/appng/core/model/RepositoryCache.java | 13 +-
.../org/appng/core/model/RepositoryCacheBase.java | 27 +-
.../appng/core/model/RepositoryCacheFactory.java | 10 +-
.../core/model/RepositoryCacheFilesystem.java | 30 +-
.../org/appng/core/model/RepositoryCacheSoap.java | 11 +-
.../java/org/appng/core/model/RepositoryMode.java | 2 +-
.../org/appng/core/model/RepositoryScheme.java | 4 +-
.../java/org/appng/core/model/RepositoryType.java | 2 +-
.../java/org/appng/core/model/RepositoryUtils.java | 2 +-
.../org/appng/core/model/RequestProcessor.java | 10 +-
.../java/org/appng/core/model/ResponseType.java | 2 +-
.../org/appng/core/model/TemplateProcessor.java | 99 ++++
.../org/appng/core/model/ThymeleafProcessor.java | 395 +++++++++----
.../org/appng/core/model/ZipFileProcessor.java | 2 +-
.../main/java/org/appng/core/repository/.gitignore | 1 +
.../core/repository/ApplicationRepository.java | 2 +-
.../repository/DatabaseConnectionRepository.java | 2 +-
.../org/appng/core/repository/GroupRepository.java | 2 +-
.../core/repository/PermissionRepository.java | 2 +-
.../core/repository/PlatformEventRepository.java | 2 +-
.../appng/core/repository/PropertyRepository.java | 2 +-
.../org/appng/core/repository/RepoRepository.java | 2 +-
.../appng/core/repository/ResourceRepository.java | 2 +-
.../org/appng/core/repository/RoleRepository.java | 2 +-
.../core/repository/SiteApplicationRepository.java | 2 +-
.../org/appng/core/repository/SiteRepository.java | 2 +-
.../appng/core/repository/SubjectRepository.java | 2 +-
.../appng/core/repository/TemplateRepository.java | 2 +-
.../repository/TemplateResourceRepository.java | 2 +-
.../config/ApplicationPostProcessor.java | 8 +-
.../core/repository/config/DataSourceFactory.java | 10 +-
.../repository/config/DatasourceConfigurer.java | 2 +-
.../core/repository/config/HikariCPConfigurer.java | 7 +-
.../repository/config/TomcatJdbcConfigurer.java | 12 +-
.../appng/core/security/BCryptPasswordHandler.java | 2 +-
.../appng/core/security/DefaultPasswordPolicy.java | 2 +-
.../java/org/appng/core/security/DigestUtil.java | 2 +-
.../org/appng/core/security/DigestValidator.java | 20 +-
.../org/appng/core/security/PasswordHandler.java | 2 +-
.../java/org/appng/core/security/SaltedDigest.java | 2 +-
.../org/appng/core/security/SaltedDigestSha1.java | 12 +-
.../appng/core/security/Sha1PasswordHandler.java | 2 +-
.../appng/core/security/signing/BaseConfig.java | 6 +-
.../core/security/signing/CertChainValidator.java | 8 +-
.../org/appng/core/security/signing/CertTools.java | 2 +-
.../core/security/signing/SignatureWrapper.java | 2 +-
.../org/appng/core/security/signing/Signer.java | 69 ++-
.../appng/core/security/signing/SignerConfig.java | 2 +-
.../core/security/signing/SigningException.java | 2 +-
.../core/security/signing/ValidatorConfig.java | 4 +-
.../core/service/ApplicationArchiveProcessor.java | 14 +-
.../appng/core/service/ApplicationProperties.java | 2 +-
.../java/org/appng/core/service/CacheService.java | 23 +-
.../java/org/appng/core/service/CoreService.java | 249 ++++-----
.../org/appng/core/service/DatabaseService.java | 46 +-
.../java/org/appng/core/service/HsqlStarter.java | 16 +-
.../org/appng/core/service/InitializerService.java | 200 +++----
.../java/org/appng/core/service/LdapService.java | 38 +-
.../org/appng/core/service/MigrationService.java | 33 +-
.../org/appng/core/service/PlatformProperties.java | 129 +++++
.../org/appng/core/service/PropertySupport.java | 58 +-
.../org/appng/core/service/TemplateService.java | 35 +-
.../core/templating/AppNGThymeleafDialect.java | 2 +-
.../appng/core/templating/ReplaceTagProcessor.java | 10 +-
.../templating/ThymeleafReplaceInterceptor.java | 2 +-
.../ThymeleafReplaceInterceptorBase.java | 6 +-
...ThymeleafStandardReplaceTagProcessorCaller.java | 2 +-
.../core/templating/ThymeleafTemplateEngine.java | 2 +-
.../resources/org/appng/core/controller/logo.txt | 14 +
.../org/appng/core/platform-config.properties | 1 +
.../org/appng/core/site-config.properties | 1 +
appng-core/src/main/xsd/appng-repository.xsd | 1 +
.../java/org/appng/api/messaging/TestReceiver.java | 9 +-
.../src/test/java/org/appng/core/PathInfoTest.java | 14 +-
.../core/application/PermissionProcessorTest.java | 4 +-
.../core/controller/ApplicationContextTest.java | 4 +-
.../org/appng/core/controller/ControllerTest.java | 27 +-
.../appng/core/controller/PlatformConfigTest.java | 52 ++
.../core/controller/PlatformProcessorTest.java | 34 +-
.../appng/core/controller/PlatformStartupTest.java | 21 +-
.../org/appng/core/controller/RedirectTest.java | 2 +-
.../core/controller/RepositoryWatcherTest.java | 2 +-
.../org/appng/core/controller/RequestUtilTest.java | 7 +-
.../appng/core/controller/SessionListenerTest.java | 4 +-
.../org/appng/core/controller/TestSupport.java | 18 +-
.../controller/filter/JspExtensionFilterTest.java | 2 +-
.../controller/filter/PageCacheFilterTest.java | 2 +-
.../core/controller/filter/RedirectFilterTest.java | 7 +-
.../core/controller/handler/GuiHandlerTest.java | 12 +-
.../handler/ServiceRequestHandlerTest.java | 12 +-
.../controller/messaging/AbstractMessagingIT.java | 5 +-
.../controller/messaging/JedisMessagingIT.java | 2 +-
.../core/controller/messaging/MessagingTest.java | 25 +-
.../controller/messaging/MultiCastMessagingIT.java | 2 +-
.../controller/messaging/RabbitMQMessagingIT.java | 2 +-
.../appng/core/controller/rest/RestActionTest.java | 23 +-
.../core/controller/rest/RestDataSourceTest.java | 2 +-
.../core/controller/rest/RestOperationTest.java | 17 +-
.../appng/core/controller/rest/model/Payment.java | 15 +
.../core/controller/rest/model/PaymentItem.java | 15 +
.../appng/core/controller/rest/model/SiteForm.java | 2 +-
.../org/appng/core/domain/PackageArchiveTest.java | 2 +-
.../org/appng/core/domain/ResourceImplTest.java | 2 +-
.../java/org/appng/core/domain/SiteImplTest.java | 4 +-
.../appng/core/domain/ValidationPatternTest.java | 2 +-
.../appng/core/model/ApplicationProviderTest.java | 4 +-
.../org/appng/core/model/CacheProviderTest.java | 2 +-
.../org/appng/core/model/JarInfoBuilderTest.java | 2 +-
.../appng/core/model/OutputFormatAndTypeTest.java | 5 +-
.../core/model/PageParameterProcessorTest.java | 8 +-
.../src/test/java/org/appng/core/model/Person.java | 10 +-
.../appng/core/model/PlatformTransformerTest.java | 72 ++-
.../org/appng/core/model/RepositoryUtilsTest.java | 2 +-
.../appng/core/model/ThymeleafProcessorTest.java | 149 ++++-
.../core/repository/AbstractRepositoryTest.java | 5 +-
.../appng/core/repository/GroupRepositoryTest.java | 2 +-
.../core/repository/PermissionRepositoryTest.java | 2 +-
.../core/repository/PropertyRepositoryTest.java | 2 +-
.../appng/core/repository/RepositoryCacheTest.java | 10 +-
.../org/appng/core/repository/RepositoryTest.java | 2 +-
.../core/repository/ResourceRepositoryTest.java | 2 +-
.../appng/core/repository/RoleRepositoryTest.java | 2 +-
.../java/org/appng/core/repository/SchemaGen.java | 4 +-
.../appng/core/repository/SiteRepositoryTest.java | 2 +-
.../core/repository/SubjectRepositoryTest.java | 2 +-
.../config/ApplicationPostProcessorTest.java | 2 +-
.../core/security/BCryptPasswordHandlerTest.java | 2 +-
.../core/security/DefaultPasswordPolicyTest.java | 2 +-
.../appng/core/security/DigestValidatorTest.java | 2 +-
.../appng/core/security/PasswordHandlerTest.java | 2 +-
.../org/appng/core/security/SaltedDigestTest.java | 6 +-
.../core/security/Sha1PasswordHandlerTest.java | 2 +-
.../appng/core/security/signing/SignerTest.java | 4 +-
.../appng/core/service/AppNGTestDataProvider.java | 19 +-
.../service/ApplicationArchiveProcessorTest.java | 6 +-
.../org/appng/core/service/CoreServiceTest.java | 16 +-
.../appng/core/service/DatabaseServiceTest.java | 4 +-
.../org/appng/core/service/HsqlStarterTest.java | 2 +-
.../appng/core/service/InitTestDataProvider.java | 9 +-
.../appng/core/service/InitializerServiceTest.java | 6 +-
.../appng/core/service/LdapContextFactoryMock.java | 4 +-
.../org/appng/core/service/LdapContextMock.java | 4 +-
.../org/appng/core/service/LdapServiceTest.java | 4 +-
.../org/appng/core/service/PlatformTestConfig.java | 188 +++++++
.../appng/core/service/PropertySupportTest.java | 2 +-
.../core/service/SiteClassLoaderBuilderTest.java | 2 +-
.../appng/core/service/TemplateServiceTest.java | 4 +-
.../org/appng/core/service/TestInitializer.java | 3 +-
.../org/appng/testapplication/TestController.java | 2 +-
.../org/appng/testapplication/TestEntities.java | 4 +-
.../java/org/appng/testapplication/TestEntity.java | 2 +-
.../org/appng/testapplication/TestService.java | 2 +-
.../src/test/resources/appNG-hsql.properties | 11 +
appng-core/src/test/resources/platformContext.xml | 115 ----
.../resources/template/thymeleaf/conf/platform.xml | 615 +++++++++++++++++++++
.../template/thymeleaf/resources/css/style.css | 4 +
.../thymeleaf/resources/html/hello-custom.html | 8 +
.../template/thymeleaf/resources/html/hello.html | 8 +
.../thymeleaf/resources/html/platform.html | 11 +
appng-documentation/pom.xml | 2 +-
.../src/main/asciidoc/listing/dependencies.txt | 8 +-
.../java/org/appng/documentation/UrlValidator.java | 2 +-
.../test/java/org/example/CalculatorService.java | 2 +-
.../src/test/java/org/example/Employee.java | 2 +-
.../src/test/java/org/example/Employees.java | 2 +-
.../src/test/java/org/example/EmployeesTest.java | 2 +-
appng-forms/pom.xml | 2 +-
.../java/org/appng/el/ExpressionEvaluator.java | 22 +-
.../src/main/java/org/appng/el/VariableMapper.java | 4 +-
.../src/main/java/org/appng/forms/FormUpload.java | 2 +-
.../java/org/appng/forms/FormUploadValidator.java | 2 +-
.../src/main/java/org/appng/forms/Request.java | 2 +-
.../java/org/appng/forms/RequestContainer.java | 2 +-
.../src/main/java/org/appng/forms/XSSUtil.java | 17 +-
.../java/org/appng/forms/impl/FormUploadBean.java | 13 +-
.../java/org/appng/forms/impl/RequestBean.java | 64 +--
.../java/org/appng/el/ExpressionEvaluatorTest.java | 10 +-
.../test/java/org/appng/forms/FormRequestTest.java | 6 +-
.../test/java/org/appng/forms/FormUploadTest.java | 2 +-
.../src/test/java/org/appng/forms/RequestTest.java | 4 +-
.../src/test/java/org/appng/forms/XSSUtilTest.java | 2 +-
appng-formtags/pom.xml | 2 +-
.../main/java/org/appng/formtags/ErrorAware.java | 2 +-
.../src/main/java/org/appng/formtags/Form.java | 13 +-
.../java/org/appng/formtags/FormConfirmation.java | 2 +-
.../src/main/java/org/appng/formtags/FormData.java | 6 +-
.../main/java/org/appng/formtags/FormElement.java | 4 +-
.../java/org/appng/formtags/FormElementOwner.java | 4 +-
.../main/java/org/appng/formtags/FormGroup.java | 2 +-
.../org/appng/formtags/FormProcessProvider.java | 2 +-
.../main/java/org/appng/formtags/LogFormData.java | 2 +-
.../java/org/appng/formtags/RuleValidation.java | 8 +-
.../appng/formtags/providers/EmailProvider.java | 20 +-
.../org/appng/formtags/FormElementRuleTest.java | 2 +-
.../java/org/appng/formtags/FormElementTest.java | 2 +-
.../org/appng/formtags/RuleValidationTest.java | 8 +-
.../test/java/org/appng/formtags/TestRequest.java | 14 +-
.../formtags/providers/EmailProviderTest.java | 4 +-
appng-mail/pom.xml | 2 +-
.../src/main/java/org/appng/mail/Address.java | 2 +-
.../src/main/java/org/appng/mail/Attachment.java | 2 +-
appng-mail/src/main/java/org/appng/mail/Mail.java | 2 +-
.../main/java/org/appng/mail/MailException.java | 2 +-
.../main/java/org/appng/mail/MailTransport.java | 2 +-
.../src/main/java/org/appng/mail/Receiver.java | 2 +-
.../java/org/appng/mail/impl/AttachmentImpl.java | 2 +-
.../java/org/appng/mail/impl/DefaultTransport.java | 14 +-
.../main/java/org/appng/mail/impl/MailImpl.java | 8 +-
.../test/java/org/appng/mail/DummyTransport.java | 2 +-
.../src/test/java/org/appng/mail/MailTest.java | 2 +-
appng-maven-plugin/pom.xml | 2 +-
.../maven/plugin/mojo/AbstractGeneratorMojo.java | 2 +-
.../mojo/GenerateApplicationConstantsMojo.java | 2 +-
.../plugin/mojo/GenerateMessageConstantsMojo.java | 2 +-
.../maven/plugin/mojo/AbstractGenerateTest.java | 2 +-
.../mojo/GenerateApplicationConstantsMojoTest.java | 2 +-
.../mojo/GenerateMessageConstantsMojoTest.java | 2 +-
appng-persistence/pom.xml | 6 +-
.../org/appng/persistence/dialect/HSQLDialect.java | 2 +-
.../persistence/dialect/MySqlTextDialect.java | 2 +-
.../persistence/dialect/SQLServer2008Dialect.java | 2 +-
.../repository/EnversSearchRepository.java | 10 +-
.../repository/EnversSearchRepositoryImpl.java | 2 +-
.../repository/QueryDslSearchRepository.java | 2 +-
.../repository/QueryDslSearchRepositoryImpl.java | 2 +-
.../appng/persistence/repository/SearchQuery.java | 23 +-
.../persistence/repository/SearchRepository.java | 2 +-
.../repository/SearchRepositoryFactoryBean.java | 2 +-
.../repository/SearchRepositoryImpl.java | 8 +-
.../appng/persistence/model/EnversTestEntity.java | 2 +-
.../org/appng/persistence/model/QTestEntity.java | 2 +-
.../org/appng/persistence/model/TestEntity.java | 2 +-
.../repository/EnversRepositoryConfiguration.java | 2 +-
.../repository/EnversSearchRepositoryTest.java | 12 +-
.../repository/QueryDslSearchRepositoryTest.java | 2 +-
.../repository/RepositoryConfiguration.java | 13 +-
.../persistence/repository/SearchQueryTest.java | 8 +-
.../repository/SearchRepositoryTest.java | 2 +-
.../repository/TestEntityEnversRepo.java | 2 +-
.../persistence/repository/TestEntityRepo.java | 2 +-
appng-rest-api/pom.xml | 3 +-
.../main/java/org/appng/api/rest/ActionHelper.java | 2 +-
.../java/org/appng/api/rest/DataSourceHelper.java | 2 +-
.../main/java/org/appng/api/rest/RestClient.java | 18 +-
.../org/appng/api/rest/RestResponseEntity.java | 2 +-
.../java/org/appng/api/rest/ActionHelperTest.java | 2 +-
.../org/appng/api/rest/DataSourceHelperTest.java | 2 +-
.../java/org/appng/api/rest/RestClientTest.java | 2 +-
appng-search/pom.xml | 2 +-
.../java/org/appng/search/DocumentProvider.java | 2 +-
.../src/main/java/org/appng/search/Search.java | 2 +-
.../main/java/org/appng/search/SearchProvider.java | 2 +-
.../org/appng/search/indexer/DocumentIndexer.java | 45 +-
.../appng/search/indexer/FileSystemProvider.java | 32 +-
.../org/appng/search/indexer/GlobalIndexer.java | 31 +-
.../java/org/appng/search/indexer/IndexConfig.java | 37 +-
.../java/org/appng/search/indexer/ParseTags.java | 18 +-
.../org/appng/search/indexer/SimpleDocument.java | 16 +-
.../main/java/org/appng/search/json/Filter.java | 2 +-
.../java/org/appng/search/json/FilterConfig.java | 2 +-
.../java/org/appng/search/json/FilterData.java | 2 +-
.../java/org/appng/search/json/FilterItem.java | 4 +-
.../src/main/java/org/appng/search/json/Json.java | 2 +-
.../src/main/java/org/appng/search/json/Page.java | 2 +-
.../src/main/java/org/appng/search/json/Part.java | 4 +-
.../main/java/org/appng/search/json/Result.java | 2 +-
.../main/java/org/appng/search/json/Results.java | 4 +-
.../main/java/org/appng/search/json/Search.java | 2 +-
.../java/org/appng/search/json/SearchFilter.java | 2 +-
.../org/appng/search/searcher/DateAdapter.java | 2 +-
.../search/searcher/GermanSearchTermProcessor.java | 12 +-
.../org/appng/search/searcher/SearchFormatter.java | 6 +-
.../appng/search/searcher/SearchTermProcessor.java | 2 +-
.../appng/search/searcher/StandardSearcher.java | 10 +-
.../org/appng/search/indexer/ParseTagsTest.java | 2 +-
.../appng/search/indexer/StandardSearcherTest.java | 10 +-
.../searcher/GermanSearchTermProcessorTest.java | 2 +-
appng-standalone/appng.bat | 1 +
appng-standalone/appng.sh | 2 +
appng-standalone/build.sh | 4 +-
appng-standalone/pom.xml | 294 +++++-----
appng-standalone/readme.txt | 16 +-
appng-standalone/run.sh | 2 +-
appng-standalone/src/main/assembly/assembly.xml | 12 +-
.../org/appng/standalone/ApplicationStartup.java | 159 +++---
appng-standalone/src/main/resources/urlrewrite.xml | 11 +
.../appng/standalone/ApplicationStartupTest.java | 2 +-
appng-standalone/start_appng.sh | 2 +-
appng-taglib/pom.xml | 2 +-
.../java/org/appng/taglib/ApplicationAdapter.java | 22 +-
.../src/main/java/org/appng/taglib/Attribute.java | 12 +-
.../src/main/java/org/appng/taglib/If.java | 12 +-
.../java/org/appng/taglib/MultiSiteSupport.java | 9 +-
.../src/main/java/org/appng/taglib/Parameter.java | 12 +-
.../main/java/org/appng/taglib/ParameterOwner.java | 2 +-
.../src/main/java/org/appng/taglib/Permission.java | 14 +-
.../main/java/org/appng/taglib/TagletAdapter.java | 16 +-
.../java/org/appng/taglib/TagletProcessor.java | 53 +-
.../src/main/java/org/appng/taglib/form/Form.java | 5 +-
.../org/appng/taglib/form/FormConfirmation.java | 6 +-
.../main/java/org/appng/taglib/form/FormData.java | 10 +-
.../java/org/appng/taglib/form/FormElement.java | 9 +-
.../main/java/org/appng/taglib/form/FormGroup.java | 2 +-
.../main/java/org/appng/taglib/search/Search.java | 34 +-
.../java/org/appng/taglib/search/SearchPart.java | 14 +-
.../java/org/appng/taglib/search/Searchable.java | 9 +-
.../test/java/org/appng/taglib/AttributeTest.java | 2 +-
.../src/test/java/org/appng/taglib/IfTest.java | 2 +-
.../org/appng/taglib/MultiSiteSupportTest.java | 6 +-
.../test/java/org/appng/taglib/ParameterTest.java | 4 +-
.../test/java/org/appng/taglib/PermissionTest.java | 2 +-
.../java/org/appng/taglib/TagletAdapterTest.java | 4 +-
.../java/org/appng/taglib/TagletProcessorTest.java | 42 +-
.../test/java/org/appng/taglib/TagletTestBase.java | 12 +-
.../appng/taglib/form/FormConfirmationTest.java | 2 +-
.../java/org/appng/taglib/search/SearchTest.java | 8 +-
appng-template-assembly/pom.xml | 2 +-
appng-template-parent/pom.xml | 4 +-
appng-testsupport/pom.xml | 2 +-
.../main/java/org/appng/testsupport/TestBase.java | 234 ++++++--
.../testsupport/persistence/ConnectionHelper.java | 2 +-
.../testsupport/persistence/ConnectionInfo.java | 2 +-
.../testsupport/persistence/DatabaseUtil.java | 100 ++--
.../appng/testsupport/persistence/HsqlServer.java | 29 +-
.../persistence/HsqlServerFactoryBean.java | 20 +-
.../testsupport/persistence/TestDataProvider.java | 2 +-
.../AttributeValueDifferenceHandler.java | 2 +-
.../validation/DateFieldDifferenceHandler.java | 2 +-
.../testsupport/validation/DifferenceHandler.java | 2 +-
.../validation/TextValueDifferenceHandler.java | 2 +-
.../validation/WritingJsonValidator.java | 11 +-
.../validation/WritingXmlValidator.java | 28 +-
.../validation/XPathDifferenceHandler.java | 4 +-
.../appng/testsupport/SimpleApplicationTest.java | 2 +-
.../java/org/appng/testsupport/TestBaseTest.java | 2 +-
.../AttributeValueDifferenceHandlerTest.java | 2 +-
.../validation/DateFieldDifferenceHandlerTest.java | 2 +-
.../validation/DifferenceHandlerTest.java | 2 +-
.../validation/TextValueDifferenceHandlerTest.java | 2 +-
.../validation/WritingJsonValidatorTest.java | 2 +-
.../validation/XPathDifferenceHandlerTest.java | 2 +-
appng-tomcat7/.gitignore | 1 -
appng-tomcat7/pom.xml | 35 --
.../org/appng/core/controller/Tomcat7Support.java | 54 --
appng-tomcat8/.gitignore | 1 -
appng-tomcat8/pom.xml | 34 --
.../org/appng/core/controller/Tomcat8Support.java | 63 ---
appng-tools/pom.xml | 2 +-
.../src/main/java/org/appng/tools/RandomUtil.java | 2 +-
.../org/appng/tools/file/FilePrefixFilter.java | 2 +-
.../org/appng/tools/file/FileSuffixFilter.java | 2 +-
.../java/org/appng/tools/file/MagicByteCheck.java | 13 +-
.../appng/tools/file/PropertyConstantCreator.java | 26 +-
.../main/java/org/appng/tools/image/Captcha.java | 15 +-
.../java/org/appng/tools/image/ImageMetaData.java | 2 +-
.../java/org/appng/tools/image/ImageProcessor.java | 13 +-
.../java/org/appng/tools/locator/Coordinate.java | 10 +-
.../org/appng/tools/locator/GMapGeoLocator.java | 36 +-
.../java/org/appng/tools/locator/GeoLocator.java | 2 +-
.../main/java/org/appng/tools/markup/XHTML.java | 2 +-
.../src/main/java/org/appng/tools/markup/XML.java | 20 +-
.../src/main/java/org/appng/tools/os/Command.java | 9 +-
.../java/org/appng/tools/os/OperatingSystem.java | 2 +-
.../java/org/appng/tools/os/StringConsumer.java | 14 +-
.../src/main/java/org/appng/tools/poi/Border.java | 2 +-
.../src/main/java/org/appng/tools/poi/Borders.java | 2 +-
.../java/org/appng/tools/poi/ColumnDefinition.java | 2 +-
.../main/java/org/appng/tools/poi/FontBuilder.java | 2 +-
.../java/org/appng/tools/poi/WorkBookHelper.java | 4 +-
.../src/main/java/org/appng/tools/ui/Chunk.java | 2 +-
.../main/java/org/appng/tools/ui/Pagination.java | 2 +-
.../java/org/appng/tools/ui/StringNormalizer.java | 2 +-
.../tools/zipcode/DefaultZipCodeValidator.java | 2 +-
.../tools/zipcode/GermanyZipCodeValidator.java | 2 +-
.../org/appng/tools/zipcode/ZipCodeCountry.java | 2 +-
.../org/appng/tools/zipcode/ZipCodeValidator.java | 2 +-
.../tools/zipcode/ZipCodeValidatorFactory.java | 10 +-
.../org/appng/tools/file/MagicByteCheckTest.java | 2 +-
.../tools/file/PropertyConstantCreatorTest.java | 2 +-
.../java/org/appng/tools/image/DimensionTest.java | 2 +-
.../org/appng/tools/image/ImageProcessorTest.java | 2 +-
.../org/appng/tools/locator/GeoLocatorTest.java | 2 +-
.../java/org/appng/tools/markup/XHTMLTest.java | 2 +-
.../test/java/org/appng/tools/os/CommandTest.java | 2 +-
.../org/appng/tools/os/OperatingSystemTest.java | 15 +
.../java/org/appng/tools/poi/WorkbookTest.java | 2 +-
.../java/org/appng/tools/ui/PaginationTest.java | 2 +-
.../org/appng/tools/ui/StringNormalizerTest.java | 2 +-
appng-upngizr/README.adoc | 7 +-
appng-upngizr/pom.xml | 2 +-
.../java/org/appng/upngizr/controller/UpNGizr.java | 4 +-
.../appng/upngizr/controller/UpNGizrConfig.java | 2 +-
.../java/org/appng/upngizr/controller/Updater.java | 124 ++---
.../org/appng/upngizr/controller/UpdaterTest.java | 4 +-
appng-xmlapi/pom.xml | 2 +-
.../xml/ApplicationPropertyConstantCreator.java | 20 +-
.../src/main/java/org/appng/xml/BaseObject.java | 2 +-
.../main/java/org/appng/xml/MarshallService.java | 29 +-
.../xml/transformation/StyleSheetProvider.java | 51 +-
.../org/appng/xml/transformation/Transformer.java | 24 +-
.../ApplicationPropertyConstantCreatorTest.java | 2 +-
.../java/org/appng/xml/MarshallServiceTest.java | 2 +-
.../xml/transformation/StyleSheetProviderTest.java | 2 +-
changelog.txt | 33 ++
license-header.txt | 2 +-
lombok.config | 1 +
pom.xml | 127 +++--
889 files changed, 7023 insertions(+), 4835 deletions(-)
create mode 100644 appng-api/src/test/java/org/appng/api/support/ApplicationResourceHolderTest.java
delete mode 100644 appng-application/src/main/webapp/WEB-INF/conf/platformContext.xml
create mode 100644 appng-cli/src/main/java/org/appng/cli/commands/platform/ExtractData.java
create mode 100644 appng-cli/src/main/java/org/appng/cli/commands/subject/HashPassword.java
create mode 100644 appng-cli/src/main/resources/context-resources.xml
create mode 100644 appng-cli/src/main/resources/org/appng/cli/commands/platform/appng
create mode 100644 appng-cli/src/main/resources/org/appng/cli/commands/platform/appng.bat
create mode 100644 appng-cli/src/test/java/org/appng/cli/CliBootstrapRunner.java
create mode 100644 appng-cli/src/test/java/org/appng/cli/commands/subject/HashPasswordTest.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/Log4jConfigurer.java
create mode 100644 appng-core/src/main/java/org/appng/core/controller/PlatformConfig.java
create mode 100644 appng-core/src/main/java/org/appng/core/model/TemplateProcessor.java
create mode 100644 appng-core/src/main/java/org/appng/core/repository/.gitignore
create mode 100644 appng-core/src/main/java/org/appng/core/service/PlatformProperties.java
create mode 100644 appng-core/src/main/resources/org/appng/core/controller/logo.txt
create mode 100644 appng-core/src/test/java/org/appng/core/controller/PlatformConfigTest.java
create mode 100644 appng-core/src/test/java/org/appng/core/service/PlatformTestConfig.java
create mode 100644 appng-core/src/test/resources/appNG-hsql.properties
delete mode 100644 appng-core/src/test/resources/platformContext.xml
create mode 100644 appng-core/src/test/resources/template/thymeleaf/conf/platform.xml
create mode 100644 appng-core/src/test/resources/template/thymeleaf/resources/css/style.css
create mode 100644 appng-core/src/test/resources/template/thymeleaf/resources/html/hello-custom.html
create mode 100644 appng-core/src/test/resources/template/thymeleaf/resources/html/hello.html
create mode 100644 appng-core/src/test/resources/template/thymeleaf/resources/html/platform.html
create mode 100755 appng-standalone/appng.bat
create mode 100755 appng-standalone/appng.sh
create mode 100644 appng-standalone/src/main/resources/urlrewrite.xml
delete mode 100644 appng-tomcat7/.gitignore
delete mode 100644 appng-tomcat7/pom.xml
delete mode 100644 appng-tomcat7/src/main/java/org/appng/core/controller/Tomcat7Support.java
delete mode 100644 appng-tomcat8/.gitignore
delete mode 100644 appng-tomcat8/pom.xml
delete mode 100644 appng-tomcat8/src/main/java/org/appng/core/controller/Tomcat8Support.java
create mode 100644 lombok.config
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
