[KARAF-5169] This closes #307
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4888b6a1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4888b6a1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4888b6a1 Branch: refs/heads/master Commit: 4888b6a1788d4d83c90f601ec00e386706a6703a Parents: b0c0822 67232b6 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jun 1 08:02:14 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 1 08:02:14 2017 +0200 ---------------------------------------------------------------------- .../internal/BlueprintStateService.java | 2 +- .../karaf/bundle/command/BundlesCommand.java | 2 +- .../karaf/bundle/command/Capabilities.java | 2 +- .../apache/karaf/bundle/command/Headers.java | 14 +-- .../karaf/bundle/command/Requirements.java | 2 +- .../apache/karaf/bundle/command/Restart.java | 2 +- .../apache/karaf/bundle/command/Services.java | 6 +- .../karaf/bundle/command/ShowBundleTree.java | 6 +- .../karaf/bundle/command/bundletree/Node.java | 6 +- .../bundle/core/internal/BundleInfoImpl.java | 12 +-- .../bundle/core/internal/BundleWatcherImpl.java | 6 +- .../bundle/core/internal/osgi/Activator.java | 2 +- .../karaf/bundle/command/TestBundleFactory.java | 6 +- .../bundle/command/bundletree/TreeTest.java | 12 +-- .../core/internal/MavenConfigServiceTest.java | 8 +- .../spring/internal/SpringStateService.java | 2 +- .../org/slf4j/impl/SimpleLoggerFactory.java | 4 +- .../karaf/config/command/ListCommand.java | 4 +- .../karaf/config/command/MetaCommand.java | 2 +- .../completers/ConfigurationCompleter.java | 2 +- .../ConfigurationPropertyCompleter.java | 2 +- .../command/completers/MetaCompleter.java | 2 +- .../karaf/config/command/EditCommandTest.java | 2 +- .../config/command/MockCommandSession.java | 2 +- .../karaf/config/command/UpdateCommandTest.java | 4 +- .../deployer/blueprint/osgi/Activator.java | 2 +- .../features/FeatureDeploymentListener.java | 6 +- .../karaf/deployer/features/osgi/Activator.java | 2 +- .../deployer/spring/SpringTransformer.java | 2 +- .../karaf/deployer/spring/osgi/Activator.java | 2 +- .../karaf/deployer/wrap/osgi/Activator.java | 2 +- .../org/apache/karaf/diagnostic/core/Dump.java | 2 +- .../core/providers/BundleDumpProvider.java | 2 +- .../karaf/diagnostic/internal/Activator.java | 8 +- .../features/command/InfoFeatureCommand.java | 2 +- .../features/command/InstallFeatureCommand.java | 2 +- .../features/command/RegionInfoCommand.java | 2 +- .../karaf/features/command/RepoListCommand.java | 2 +- .../features/command/RepoRefreshCommand.java | 2 +- .../command/UninstallFeatureCommand.java | 2 +- .../karaf/features/internal/model/Content.java | 10 +- .../karaf/features/internal/model/Feature.java | 2 +- .../region/AbstractRegionDigraphVisitor.java | 10 +- .../internal/region/OfflineResolver.java | 6 +- .../features/internal/region/Subsystem.java | 2 +- .../region/SubsystemResolveContext.java | 12 +-- .../internal/region/SubsystemResolver.java | 6 +- .../repository/AggregateRepository.java | 4 +- .../internal/repository/BaseRepository.java | 8 +- .../internal/repository/XmlRepository.java | 4 +- .../internal/resolver/CapabilitySet.java | 2 +- .../internal/resolver/ResolverUtil.java | 2 +- .../internal/resolver/ResourceBuilder.java | 14 +-- .../features/internal/service/Deployer.java | 6 +- .../internal/service/EventAdminListener.java | 6 +- .../service/FeatureConfigInstaller.java | 2 +- .../features/internal/service/Overrides.java | 4 +- .../internal/service/RequirementSort.java | 10 +- .../features/management/codec/JmxFeature.java | 2 +- .../karaf/features/FeaturesServiceTest.java | 4 +- .../org/apache/karaf/features/TestBase.java | 14 +-- .../region/FeaturesDependenciesTest.java | 12 +-- .../features/internal/region/SubsystemTest.java | 82 +++++++------- .../service/BootFeaturesInstallerTest.java | 2 +- .../features/internal/service/DeployerTest.java | 84 +++++++-------- .../internal/service/OverridesTest.java | 4 +- .../internal/service/StateStorageTest.java | 2 +- .../http/core/internal/ServletEventHandler.java | 2 +- .../http/core/internal/ServletServiceImpl.java | 4 +- .../karaf/instance/core/InstanceSettings.java | 12 +-- .../core/internal/InstanceServiceImpl.java | 4 +- .../core/internal/InstancesMBeanImpl.java | 2 +- .../org/apache/karaf/instance/main/Execute.java | 4 +- .../org/apache/karaf/jpm/impl/ProcessImpl.java | 6 +- .../instance/core/InstanceSettingsTest.java | 7 +- .../core/internal/InstanceServiceImplTest.java | 4 +- .../internal/InstanceServiceMBeanImplTest.java | 4 +- .../apache/karaf/itests/ImportServiceTest.java | 2 +- .../apache/karaf/itests/JMXSecurityTest.java | 18 ++-- .../apache/karaf/itests/KarafTestSupport.java | 14 +-- .../org/apache/karaf/itests/PackageTest.java | 2 +- .../karaf/itests/ssh/SshCommandTestBase.java | 2 +- .../org/apache/karaf/itests/util/RunIfRule.java | 2 +- .../blueprint/config/impl/NamespaceHandler.java | 2 +- .../jasypt/handler/NamespaceHandler.java | 2 +- ...tableConfigAdminPropertyPlaceholderTest.java | 4 +- .../EncryptablePropertyPlaceholderTest.java | 4 +- .../jaas/boot/principal/GroupPrincipal.java | 2 +- .../karaf/jaas/boot/principal/RolePolicy.java | 2 +- .../karaf/jaas/command/JaasCommandSupport.java | 4 +- .../karaf/jaas/command/ListUsersCommand.java | 4 +- .../karaf/jaas/command/ManageRealmCommand.java | 2 +- .../completers/LoginModuleNameCompleter.java | 2 +- .../jaas/command/ManageRealmCommandTest.java | 2 +- .../karaf/jaas/config/impl/Activator.java | 10 +- .../apache/karaf/jaas/config/impl/Config.java | 2 +- .../jaas/config/impl/OsgiConfiguration.java | 2 +- .../jaas/config/impl/OsgiKeystoreManager.java | 2 +- .../karaf/jaas/jasypt/impl/Activator.java | 2 +- .../jaas/jasypt/impl/JasyptEncryptionTest.java | 2 +- .../jaas/modules/AbstractKarafLoginModule.java | 2 +- .../audit/EventAdminAuditLoginModule.java | 2 +- .../modules/encryption/EncryptionSupport.java | 2 +- .../karaf/jaas/modules/impl/KarafRealm.java | 4 +- .../jaas/modules/ldap/LDAPLoginModule.java | 2 +- .../karaf/jaas/modules/ldap/LDAPOptions.java | 2 +- .../modules/ldap/ManagedSSLSocketFactory.java | 2 +- .../modules/osgi/OsgiConfigLoginModule.java | 2 +- .../properties/DigestPasswordLoginModule.java | 6 +- .../properties/PropertiesBackingEngine.java | 18 ++-- .../properties/PropertiesLoginModule.java | 6 +- .../publickey/PublickeyBackingEngine.java | 18 ++-- .../modules/publickey/PublickeyLoginModule.java | 8 +- .../modules/syncope/SyncopeBackingEngine.java | 2 +- .../modules/syncope/SyncopeLoginModule.java | 6 +- .../jaas/modules/krb5/Krb5LoginModuleTest.java | 2 +- .../jaas/modules/ldap/LdapLoginModuleTest.java | 6 +- .../jaas/modules/ldap/LdapPoolingTest.java | 4 +- .../properties/PropertiesLoginModuleTest.java | 14 +-- .../java/org/apache/karaf/jms/JmsMessage.java | 2 +- .../jms/pool/internal/PooledConnection.java | 6 +- .../karaf/jms/pool/internal/PooledSession.java | 6 +- .../karaf/jndi/internal/JndiServiceImpl.java | 4 +- .../karaf/jndi/internal/osgi/Activator.java | 2 +- .../karaf/jpa/hibernate/impl/Activator.java | 2 +- .../jpa/hibernate/impl/StatisticsPublisher.java | 2 +- .../java/org/apache/karaf/kar/internal/Kar.java | 2 +- .../karaf/kar/internal/KarServiceImpl.java | 12 +-- .../org/apache/karaf/log/command/LogEntry.java | 2 +- .../org/apache/karaf/log/command/LogTail.java | 2 +- .../log/core/internal/LogServiceLog4j1Impl.java | 2 +- .../apache/karaf/log/core/internal/LruList.java | 2 +- .../karaf/log/core/internal/osgi/Activator.java | 2 +- .../karaf/main/KarafActivatorManager.java | 2 +- .../main/java/org/apache/karaf/main/Main.java | 8 +- .../karaf/main/lock/BaseJDBCLockTest.java | 4 +- .../management/ConnectorServerFactory.java | 2 +- .../karaf/management/KarafMBeanServerGuard.java | 14 +-- .../karaf/management/RmiRegistryFactory.java | 2 +- .../karaf/management/internal/Activator.java | 4 +- .../management/internal/BulkRequestContext.java | 6 +- .../internal/JMXSecurityMBeanImpl.java | 2 +- .../management/KarafMBeanServerGuardTest.java | 106 +++++++++---------- .../internal/JMXSecurityMBeanImplTestCase.java | 10 +- .../karaf/obr/command/ResolveCommand.java | 2 +- .../apache/karaf/packages/command/Exports.java | 2 +- .../karaf/packages/core/PackageVersion.java | 2 +- .../core/internal/PackageServiceImpl.java | 6 +- .../core/internal/filter/ExprTokenizer.java | 2 +- .../core/internal/filter/FilterParser.java | 2 +- .../karaf/profile/command/ProfileDisplay.java | 8 +- .../scheduler/command/support/ScriptJob.java | 2 +- .../internal/ScrServiceMBeanImpl.java | 2 +- .../karaf/service/command/ListServices.java | 6 +- .../service/command/ObjectClassCompleter.java | 2 +- .../org/apache/karaf/service/command/Wait.java | 2 +- .../core/internal/ServicesMBeanImpl.java | 2 +- .../service/command/TestBundleFactory.java | 6 +- .../service/guard/impl/GuardProxyCatalog.java | 20 ++-- .../guard/tools/ACLConfigurationParser.java | 12 +-- .../guard/impl/GuardProxyCatalogTest.java | 88 +++++++-------- .../guard/impl/GuardingEventHookTest.java | 46 ++++---- .../guard/impl/GuardingFindHookTest.java | 20 ++-- .../guard/tools/ACLConfigurationParserTest.java | 22 ++-- .../felix/eventadmin/impl/Configuration.java | 2 +- .../eventadmin/impl/handler/EventAdminImpl.java | 2 +- .../karaf/services/staticcm/Configurations.java | 2 +- .../karaf/shell/commands/impl/InfoAction.java | 6 +- .../shell/commands/impl/ThreadsAction.java | 6 +- .../shell/commands/impl/info/Activator.java | 2 +- .../console/completer/StringsCompleter.java | 2 +- .../commands/basic/DefaultActionPreparator.java | 18 ++-- .../commands/converter/DefaultConverter.java | 2 +- .../gogo/commands/converter/GenericType.java | 2 +- .../shell/commands/basic/SimpleCommand.java | 2 +- .../commands/converter/DefaultConverter.java | 2 +- .../shell/commands/converter/GenericType.java | 2 +- .../shell/commands/meta/ActionMetaData.java | 4 +- .../commands/meta/ActionMetaDataFactory.java | 6 +- .../karaf/shell/compat/ArgumentCompleter.java | 18 ++-- .../karaf/shell/compat/CommandTracker.java | 2 +- .../shell/compat/OldArgumentCompleter.java | 18 ++-- .../shell/console/CommandSessionHolder.java | 2 +- .../karaf/shell/console/MultiException.java | 2 +- .../karaf/shell/console/OsgiCommandSupport.java | 4 +- .../shell/console/commands/GenericType.java | 2 +- .../console/commands/NamespaceHandler.java | 8 +- .../console/completer/AggregateCompleter.java | 2 +- .../console/completer/ArgumentCompleter.java | 18 ++-- .../completer/CommandNamesCompleter.java | 4 +- .../console/completer/CommandsCompleter.java | 30 +++--- .../console/completer/OldArgumentCompleter.java | 18 ++-- .../karaf/shell/console/completer/Parser.java | 8 +- .../console/completer/StringsCompleter.java | 2 +- .../impl/SecuredCommandConfigTransformer.java | 6 +- .../impl/SecuredCommandProcessorImpl.java | 2 +- .../org/apache/karaf/shell/util/ShellUtil.java | 2 +- .../apache/karaf/shell/api/console/Signal.java | 2 +- .../action/command/DefaultActionPreparator.java | 6 +- .../shell/impl/action/command/ManagerImpl.java | 6 +- .../action/osgi/AggregateServiceTracker.java | 6 +- .../impl/action/osgi/CommandExtension.java | 2 +- .../impl/action/osgi/MultiServiceTracker.java | 6 +- .../shell/impl/action/osgi/RegistryImpl.java | 8 +- .../impl/action/osgi/SingleServiceTracker.java | 4 +- .../impl/console/CommandNamesCompleter.java | 2 +- .../karaf/shell/impl/console/RegistryImpl.java | 8 +- .../impl/console/commands/SubShellCommand.java | 2 +- .../impl/console/commands/help/HelpCommand.java | 4 +- .../commands/help/SimpleHelpProvider.java | 2 +- .../impl/console/osgi/EventAdminListener.java | 4 +- .../osgi/secured/SecuredSessionFactoryImpl.java | 6 +- .../shell/impl/console/parsing/KarafParser.java | 2 +- .../shell/impl/console/standalone/Main.java | 2 +- .../support/RegexCommandLoggingFilter.java | 2 +- .../support/completers/StringsCompleter.java | 2 +- .../support/converter/DefaultConverter.java | 2 +- .../shell/support/converter/GenericType.java | 2 +- .../karaf/shell/support/parsing/GogoParser.java | 8 +- .../apache/karaf/shell/support/table/Row.java | 4 +- .../org/apache/karaf/shell/ssh/Activator.java | 2 +- .../karaf/shell/ssh/KarafJaasAuthenticator.java | 2 +- .../org/apache/karaf/shell/ssh/SshUtils.java | 2 +- .../shell/ssh/UserAuthFactoriesFactory.java | 4 +- .../java/org/apache/karaf/shell/table/Row.java | 4 +- .../apache/karaf/shell/table/ShellTable.java | 4 +- .../karaf/subsystem/commands/InfoAction.java | 10 +- .../subsystem/commands/SubsystemCompleter.java | 2 +- .../subsystem/commands/SubsystemSupport.java | 8 +- .../management/internal/SystemMBeanImpl.java | 2 +- .../org/apache/karaf/tooling/AssemblyMojo.java | 2 +- .../java/org/apache/karaf/tooling/KarMojo.java | 2 +- .../commands/AsciiDoctorCommandHelpPrinter.java | 2 +- .../commands/DocBookCommandHelpPrinter.java | 2 +- .../tooling/commands/GenerateHelpMojo.java | 4 +- .../commands/UserConfCommandHelpPrinter.java | 2 +- .../tooling/features/AbstractFeatureMojo.java | 10 +- .../features/ExportFeatureMetaDataMojo.java | 4 +- .../features/GenerateDescriptorMojo.java | 12 +-- .../karaf/tooling/utils/Dependency30Helper.java | 2 +- .../karaf/tooling/utils/ManifestUtils.java | 6 +- .../java/org/apache/karaf/util/XmlUtils.java | 6 +- .../karaf/util/tracker/BaseActivator.java | 2 +- .../web/internal/WebContainerServiceImpl.java | 10 +- .../karaf/web/internal/WebEventHandler.java | 2 +- .../web/management/internal/WebMBeanImpl.java | 4 +- .../webconsole/features/FeaturesPlugin.java | 4 +- .../apache/karaf/webconsole/gogo/Terminal.java | 6 +- .../karaf/webconsole/http/HttpPlugin.java | 8 +- .../webconsole/http/ServletEventHandler.java | 2 +- .../karaf/webconsole/http/WebEventHandler.java | 2 +- .../webconsole/instance/InstancePlugin.java | 2 +- .../webconsole/instance/InstancePluginTest.java | 4 +- 253 files changed, 811 insertions(+), 808 deletions(-) ----------------------------------------------------------------------
