Skip to content
Permalink
Browse files

Organising imports

  • Loading branch information...
atooni committed Jun 4, 2019
1 parent 4e08986 commit c3cc55db7df73b150815c05b9c3717c70c862ebc
Showing with 461 additions and 608 deletions.
  1. +1 −1 ....activemq.brokerstarter/src/main/scala/blended/activemq/brokerstarter/internal/BrokerConfig.scala
  2. +1 −1 ...mq.brokerstarter/src/test/scala/blended/activemq/brokerstarter/internal/BrokerActivatorSpec.scala
  3. +1 −1 ....activemq.client/src/test/scala/blended/activemq/client/internal/FailingClientActivatorSpec.scala
  4. +1 −1 ...vemq.client/src/test/scala/blended/activemq/client/internal/RoundtripConnectionVerifierSpec.scala
  5. +1 −1 ...ka.http.jmsqueue/src/main/scala/blended/akka/http/jmsqueue/BlendedAkkaHttpJmsqueueActivator.scala
  6. +1 −1 blended.akka.http.jmsqueue/src/main/scala/blended/akka/http/jmsqueue/internal/HttpQueueConfig.scala
  7. +5 −5 blended.akka.http.jmsqueue/src/main/scala/blended/akka/http/jmsqueue/internal/HttpQueueService.scala
  8. +1 −1 ....akka.http.jmsqueue/src/test/scala/blended/akka/http/jmsqueue/internal/HttpQueueServiceSpec.scala
  9. +2 −2 blended.akka.http.proxy/src/main/scala/blended/akka/http/proxy/BlendedAkkaHttpProxyActivator.scala
  10. +1 −1 blended.akka.http.proxy/src/main/scala/blended/akka/http/proxy/internal/ProxyConfig.scala
  11. +5 −5 blended.akka.http.proxy/src/main/scala/blended/akka/http/proxy/internal/ProxyRoute.scala
  12. +2 −2 blended.akka.http.proxy/src/test/scala/blended/akka/http/proxy/internal/ProxyRouteSpec.scala
  13. +3 −3 blended.akka.http.proxy/src/test/scala/blended/akka/http/proxy/internal/TestServer.scala
  14. +1 −1 blended.akka.http.restjms/src/main/scala/blended/akka/http/restjms/AkkaHttpRestJmsActivator.scala
  15. +5 −5 blended.akka.http.restjms/src/main/scala/blended/akka/http/restjms/internal/JMSRequestor.scala
  16. +1 −1 blended.akka.http.restjms/src/test/scala/blended/akka/http/restjms/internal/JMSRequestorSetup.scala
  17. +3 −4 blended.akka.http/src/main/scala/blended/akka/http/internal/BlendedAkkaHttpActivator.scala
  18. +5 −10 blended.akka.http/src/main/scala/blended/akka/http/internal/RouteProvider.scala
  19. +4 −4 blended.akka.http/src/test/scala/blended/akka/http/internal/RouteProviderSpec.scala
  20. +3 −5 blended.akka/src/main/scala/blended/akka/ActorSystemWatching.scala
  21. +1 −1 blended.akka/src/main/scala/blended/akka/OSGIActor.scala
  22. +1 −3 blended.akka/src/main/scala/blended/akka/internal/ActorSystemCapsule.scala
  23. +1 −1 blended.akka/src/main/scala/blended/akka/internal/BlendedAkkaActivator.scala
  24. +2 −1 blended.camel.utils/src/main/scala/blended/camel/utils/CamelContextPropertyProvider.scala
  25. +2 −2 ...ntext.impl/src/main/scala/blended/container/context/impl/internal/ContainerContextActivator.scala
  26. +1 −1 ...er.context.impl/src/main/scala/blended/container/context/impl/internal/ContainerContextImpl.scala
  27. +2 −2 ....impl/src/main/scala/blended/container/context/impl/internal/ContainerIdentifierServiceImpl.scala
  28. +1 −1 blended.jetty.boot/src/main/scala/blended/jetty/boot/internal/JettyActivator.scala
  29. +1 −1 blended.jms.bridge/src/main/scala/blended/jms/bridge/internal/BridgeController.scala
  30. +1 −1 blended.jms.bridge/src/main/scala/blended/jms/bridge/internal/JmsRetryProcessor.scala
  31. +1 −1 blended.jms.sampler/src/main/scala/blended/jms/sampler/internal/JMSSampleActor.scala
  32. +1 −1 blended.jms.sampler/src/main/scala/blended/jms/sampler/internal/JMSSampleControlActor.scala
  33. +2 −2 blended.jms.sampler/src/main/scala/blended/jms/sampler/internal/JmsSamplerActivator.scala
  34. +2 −2 blended.jms.utils/src/main/scala/blended/jms/utils/CloningMessageFactory.scala
  35. +2 −2 blended.jms.utils/src/main/scala/blended/jms/utils/JMSSupport.scala
  36. +1 −0 blended.jms.utils/src/main/scala/blended/jms/utils/PollingJMSReceiver.scala
  37. +1 −1 blended.jms.utils/src/main/scala/blended/jms/utils/internal/ConnectionCloseActor.scala
  38. +1 −1 blended.jms.utils/src/main/scala/blended/jms/utils/internal/ConnectionHolder.scala
  39. +1 −2 blended.jms.utils/src/main/scala/blended/jms/utils/internal/JmsConnectionController.scala
  40. +1 −1 blended.jms.utils/src/main/scala/blended/jms/utils/internal/Protocol.scala
  41. +1 −1 blended.jms.utils/src/test/scala/blended/jms/utils/internal/CamelShutdownSpec.scala
  42. +1 −0 blended.jms.utils/src/test/scala/blended/jms/utils/internal/ConnectionStateManagerSpec.scala
  43. +2 −3 blended.jms.utils/src/test/scala/blended/jms/utils/internal/JMSPingPerformerSpec.scala
  44. +1 −1 blended.jmx/src/main/scala/blended/jmx/internal/BlendedJmxActivator.scala
  45. +1 −1 blended.jolokia/src/main/scala/blended/jolokia/JolokiaObject.scala
  46. +1 −1 blended.jolokia/src/main/scala/blended/jolokia/MBeanSearchDef.scala
  47. +2 −2 blended.launcher/src/main/java/blended/launcher/runtime/Branding.java
  48. +2 −1 blended.launcher/src/main/scala/blended/launcher/Cmdline.scala
  49. +6 −6 blended.launcher/src/main/scala/blended/launcher/Launcher.scala
  50. +3 −3 blended.launcher/src/main/scala/blended/launcher/jvmrunner/JvmLauncher.scala
  51. +1 −1 blended.launcher/src/test/scala/blended/launcher/EquinoxFrameworkTest.scala
  52. +3 −2 blended.launcher/src/test/scala/blended/launcher/FelixFrameworkTest.scala
  53. +7 −13 blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/MgmtReporter.scala
  54. +2 −2 blended.mgmt.agent/src/main/scala/blended/mgmt/agent/internal/OsgiMgmtReporter.scala
  55. +2 −2 blended.mgmt.base/src/main/scala/blended/mgmt/base/internal/FrameworkService.scala
  56. +2 −2 blended.mgmt.mock/src/main/scala/blended/mgmt/mock/MockObjects.scala
  57. +4 −4 blended.mgmt.mock/src/main/scala/blended/mgmt/mock/clients/MgmtMockClients.scala
  58. +2 −5 ...ded.mgmt.repo.rest/src/main/scala/blended/mgmt/repo/rest/internal/ArtifactRepoRestActivator.scala
  59. +7 −14 blended.mgmt.repo/src/main/scala/blended/mgmt/repo/file/FileArtifactRepo.scala
  60. +1 −2 blended.mgmt.repo/src/main/scala/blended/mgmt/repo/internal/ArtifactRepoActivator.scala
  61. +4 −6 blended.mgmt.repo/src/test/scala/blended/mgmt/repo/file/FileArtifactRepoSpec.scala
  62. +5 −8 blended.mgmt.rest/src/main/scala/blended/mgmt/rest/internal/CollectorService.scala
  63. +4 −3 blended.mgmt.rest/src/main/scala/blended/mgmt/rest/internal/CollectorServiceImpl.scala
  64. +1 −1 blended.mgmt.rest/src/main/scala/blended/mgmt/rest/internal/MgmtRestActivator.scala
  65. +4 −6 blended.mgmt.rest/src/main/scala/blended/mgmt/rest/internal/RemoteContainerStatePersistor.scala
  66. +1 −1 blended.mgmt.rest/src/test/scala/blended/mgmt/rest/internal/CollectorServicePojosrSpec.scala
  67. +5 −6 blended.mgmt.rest/src/test/scala/blended/mgmt/rest/internal/CollectorServiceSpec.scala
  68. +1 −2 blended.mgmt.service.jmx/src/main/scala/blended/mgmt/service/jmx/internal/ServiceJmxActivator.scala
  69. +3 −3 blended.mgmt.service.jmx/src/main/scala/blended/mgmt/service/jmx/internal/ServiceJmxAnalyser.scala
  70. +1 −1 blended.mgmt.service.jmx/src/main/scala/blended/mgmt/service/jmx/internal/ServiceJmxCollector.scala
  71. +2 −2 blended.mgmt.ws/src/test/scala/blended/mgmt/ws/internal/MgmtWebSocketSpec.scala
  72. +5 −5 blended.persistence.h2/src/main/scala/blended/persistence/jdbc/PersistedClassDao.scala
  73. +3 −2 blended.persistence.h2/src/main/scala/blended/persistence/jdbc/PersistedField.scala
  74. +3 −3 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/DbFactory.scala
  75. +1 −4 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/DummyPlatformTransactionManager.scala
  76. +4 −3 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/LoadTest.scala
  77. +2 −2 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/PersistedClassDaoTest.scala
  78. +4 −4 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/PersistedFieldTest.scala
  79. +2 −2 blended.persistence.h2/src/test/scala/blended/persistence/jdbc/PersistenceServiceJdbcTest.scala
  80. +4 −11 blended.prickle.akka.http/src/main/scala/blended/prickle/akka/http/PrickleSupport.scala
  81. +3 −7 blended.prickle.akka.http/src/test/scala/blended/prickle/akka/http/PrickleSupportSpec.scala
  82. +2 −3 ....helloworld/src/main/scala/blended/akka/http/sample/helloworld/internal/HelloworldActivator.scala
  83. +2 −2 ...loworld/src/test/scala/blended/akka/http/sample/helloworld/internal/HelloworldActivatorSpec.scala
  84. +1 −1 ....samples/blended.samples.jms/src/main/scala/blended/samples/jms/internal/JmsSampleActivator.scala
  85. +1 −2 ...security.akka.http/src/main/scala/blended/security/akka/http/DummyBlendedSecurityDirectives.scala
  86. +3 −7 blended.security.akka.http/src/main/scala/blended/security/akka/http/JAASSecurityDirectives.scala
  87. +1 −2 ...ded.security.akka.http/src/test/scala/blended/security/akka/http/JAASSecurityDirectivesSpec.scala
  88. +1 −1 blended.security.boot/src/main/scala/blended/security/boot/BlendedLoginModule.scala
  89. +1 −1 blended.security.login.api/src/main/scala/blended/security/login/api/TokenStore.scala
  90. +1 −2 blended.security.login.impl/src/test/scala/blended/security/login/internal/TokenStoreSpec.scala
  91. +1 −1 ...ed.security.login.rest/src/test/scala/blended/security/login/rest/internal/LoginServiceSpec.scala
  92. +4 −4 blended.security.scep.standalone/src/main/scala/blended/security/scep/standalone/CertRefresher.scala
  93. +5 −9 blended.security.scep.standalone/src/main/scala/blended/security/scep/standalone/ScepClientApp.scala
  94. +2 −3 blended.security.scep/src/test/scala/blended/security/scep/internal/ScepTestClient.scala
  95. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/CertificateHolder.scala
  96. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/MemoryKeystore.scala
  97. +1 −0 blended.security.ssl/src/main/scala/blended/security/ssl/X509CertificateInfo.scala
  98. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/internal/CertificateManagerConfig.scala
  99. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/internal/CertificateRefresher.scala
  100. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/internal/ConfigCommonNameProvider.scala
  101. +0 −1 blended.security.ssl/src/main/scala/blended/security/ssl/internal/JavaKeystore.scala
  102. +1 −1 blended.security.ssl/src/main/scala/blended/security/ssl/internal/TrustStoreRefresher.scala
  103. +1 −1 blended.security.ssl/src/test/scala/blended/security/ssl/SecurityTestSupport.scala
  104. +2 −1 blended.security.test/src/test/scala/blended/security/ConfigLoginSpec.scala
  105. +2 −0 blended.security.test/src/test/scala/blended/security/ConfigPermissionManagerSpec.scala
  106. +1 −1 blended.security/jvm/src/main/scala/blended/security/ConfigLoginModule.scala
  107. +4 −4 blended.security/jvm/src/main/scala/blended/security/LDAPLoginModule.scala
  108. +1 −1 blended.security/jvm/src/main/scala/blended/security/RichSubject.scala
  109. +1 −1 blended.security/jvm/src/main/scala/blended/security/internal/GroupPermissionManager.scala
  110. +1 −1 blended.security/jvm/src/main/scala/blended/security/internal/LDAPLoginConfig.scala
  111. +1 −1 blended.security/jvm/src/main/scala/blended/security/internal/SecurityActivator.scala
  112. +3 −3 blended.security/shared/src/main/scala/blended/security/BlendedPermission.scala
  113. +1 −1 blended.streams.dispatcher/src/main/scala/blended/streams/dispatcher/internal/ProviderResolver.scala
  114. +1 −1 ...eams.dispatcher/src/main/scala/blended/streams/dispatcher/internal/ResourceTypeRouterConfig.scala
  115. +1 −1 ...ms.dispatcher/src/main/scala/blended/streams/dispatcher/internal/builder/RunnableDispatcher.scala
  116. +2 −2 ...d.streams.dispatcher/src/test/scala/blended/streams/dispatcher/internal/builder/CbeFlowSpec.scala
  117. +1 −1 ...ispatcher/src/test/scala/blended/streams/dispatcher/internal/builder/DispatcherOutboundSpec.scala
  118. +1 −1 ...her/src/test/scala/blended/streams/dispatcher/internal/builder/ResourceTypeRouterConfigSpec.scala
  119. +1 −1 blended.streams/src/main/scala/blended/streams/AckSourceLogic.scala
  120. +1 −1 blended.streams/src/main/scala/blended/streams/FlowProcessor.scala
  121. +1 −1 blended.streams/src/main/scala/blended/streams/StreamControllerSupport.scala
  122. +5 −5 blended.streams/src/main/scala/blended/streams/file/FileAckSource.scala
  123. +2 −2 blended.streams/src/main/scala/blended/streams/jms/JmsDestinationResolver.scala
  124. +1 −1 blended.streams/src/main/scala/blended/streams/jms/JmsFlowSupport.scala
  125. +1 −1 blended.streams/src/main/scala/blended/streams/jms/JmsSinkStage.scala
  126. +1 −1 blended.streams/src/main/scala/blended/streams/jms/JmsSourceStage.scala
  127. +2 −2 blended.streams/src/main/scala/blended/streams/jms/JmsStreamSupport.scala
  128. +1 −1 blended.streams/src/main/scala/blended/streams/processor/HeaderTransformProcessor.scala
  129. +9 −8 blended.streams/src/main/scala/blended/streams/transaction/FlowTransactionActor.scala
  130. +1 −1 blended.streams/src/main/scala/blended/streams/transaction/FlowTransactionEvent.scala
  131. +1 −1 blended.streams/src/main/scala/blended/streams/transaction/FlowTransactionStream.scala
  132. +2 −2 blended.streams/src/test/scala/blended/streams/AckSourceLogicSpec.scala
  133. +1 −1 blended.streams/src/test/scala/blended/streams/processor/FlowProcessorSpec.scala
  134. +1 −1 blended.streams/src/test/scala/blended/streams/processor/HeaderProcessorSpec.scala
  135. +1 −1 blended.streams/src/test/scala/blended/streams/transaction/FlowTransactionManagerSpec.scala
  136. +3 −4 blended.streams/src/test/scala/blended/streams/transaction/FlowTransactionSpec.scala
  137. +1 −1 blended.streams/src/test/scala/blended/streams/transaction/TransactionPersistorSpec.scala
  138. +1 −0 blended.testsupport.pojosr/src/main/scala/blended/testsupport/pojosr/BlendedPojoRegistry.scala
  139. +0 −1 blended.testsupport/src/main/java/blended/testsupport/XMLMessageFactory.java
  140. +1 −1 blended.testsupport/src/main/scala/blended/testsupport/TestActorSys.scala
  141. +1 −5 blended.testsupport/src/main/scala/blended/testsupport/TestFile.scala
  142. +4 −4 blended.testsupport/src/main/scala/blended/testsupport/camel/CamelTestSupport.scala
  143. +2 −2 blended.testsupport/src/main/scala/blended/testsupport/camel/MockAssertion.scala
  144. +3 −5 blended.testsupport/src/main/scala/blended/testsupport/retry/Retry.scala
  145. +3 −6 blended.testsupport/src/main/scala/blended/testsupport/scalatest/LoggingFreeSpec.scala
  146. +1 −0 blended.testsupport/src/main/scala/blended/testsupport/security/DummyLoginConfiguration.scala
  147. +0 −2 blended.testsupport/src/test/java/blended/testsupport/XMLMessageFactoryTest.java
  148. +4 −5 blended.testsupport/src/test/scala/blended/testsupport/TestFileTest.scala
  149. +1 −1 blended.updater.config/jvm/src/main/scala/blended/launcher/config/LauncherConfig.scala
  150. +2 −2 blended.updater.config/jvm/src/main/scala/blended/updater/config/ConfigConverter.scala
  151. +1 −1 blended.updater.config/jvm/src/main/scala/blended/updater/config/ConfigWriter.scala
  152. +3 −4 blended.updater.config/jvm/src/main/scala/blended/updater/config/LocalOverlays.scala
  153. +1 −1 blended.updater.config/jvm/src/main/scala/blended/updater/config/OverlayConfigCompanion.scala
  154. +4 −11 blended.updater.config/jvm/src/main/scala/blended/updater/config/util/PlaceholderProcessor.scala
  155. +3 −9 blended.updater.config/jvm/src/main/scala/blended/updater/config/util/Unzipper.scala
  156. +4 −6 blended.updater.config/jvm/src/test/scala/blended/updater/config/overlayTest.scala
  157. +4 −11 blended.updater.config/jvm/src/test/scala/blended/updater/config/util/PlaceholderProcessor.scala
  158. +3 −2 blended.updater.config/jvm/src/test/scala/blended/updater/config/util/UnzipperTest.scala
  159. +2 −11 blended.updater.config/shared/src/main/scala/blended/updater/config/json/PrickleProtocol.scala
  160. +1 −2 blended.updater.config/shared/src/main/scala/blended/updater/config/util/StreamCopy.scala
  161. +3 −3 blended.updater.config/shared/src/test/scala/blended/updater/config/MapperSpec.scala
  162. +4 −4 blended.updater.config/shared/src/test/scala/blended/updater/config/PrickleSpec.scala
  163. +1 −4 blended.updater.config/shared/src/test/scala/blended/updater/config/TestData.scala
  164. +2 −2 blended.updater.remote/src/main/scala/blended/updater/remote/FileSystemOverlayConfigPersistor.scala
  165. +2 −2 blended.updater.remote/src/main/scala/blended/updater/remote/FileSystemRuntimeConfigPersistor.scala
  166. +1 −0 blended.updater.remote/src/main/scala/blended/updater/remote/Mapper.scala
  167. +2 −2 blended.updater.remote/src/main/scala/blended/updater/remote/PersistentContainerStatePersistor.scala
  168. +2 −3 blended.updater.remote/src/main/scala/blended/updater/remote/internal/RemoteCommands.scala
  169. +3 −6 blended.updater.remote/src/main/scala/blended/updater/remote/internal/RemoteUpdaterActivator.scala
  170. +2 −2 blended.updater.remote/src/test/scala/blended/updater/remote/RemoteUpdaterTest.scala
  171. +2 −3 blended.updater.tools/src/main/scala/blended/updater/tools/configbuilder/MvnGavSupport.scala
  172. +0 −2 blended.updater.tools/src/test/scala/blended/updater/tools/configbuilder/FragmentResolverTest.scala
  173. +1 −1 ...ed.updater.tools/src/test/scala/blended/updater/tools/configbuilder/RuntimConfigBuilderSpec.scala
  174. +4 −10 blended.updater/src/main/scala/blended/updater/ArtifactDownloader.scala
  175. +1 −7 blended.updater/src/main/scala/blended/updater/LocalProfile.scala
  176. +4 −12 blended.updater/src/main/scala/blended/updater/ProfileFsHelper.scala
  177. +2 −7 blended.updater/src/main/scala/blended/updater/Unpacker.scala
  178. +4 −4 blended.updater/src/main/scala/blended/updater/Updater.scala
  179. +4 −11 blended.updater/src/main/scala/blended/updater/internal/BlendedUpdaterActivator.scala
  180. +8 −14 blended.updater/src/main/scala/blended/updater/internal/Commands.scala
  181. +2 −1 blended.util.logging/src/main/scala/blended/util/logging/Logger.scala
  182. +1 −0 blended.util/src/main/scala/blended/util/config/ConfigAccessor.scala
  183. +1 −1 blended.util/src/main/scala/blended/util/config/ConfigDefaultGetter.scala
  184. +1 −1 blended.util/src/main/scala/blended/util/config/ConfigOptionGetter.scala
  185. +1 −1 blended.util/src/test/scala/blended/util/config/ConfigAccessorSpec.scala
  186. +1 −2 blended.util/src/test/scala/blended/util/config/ConfigDefaultGetterSpec.scala
  187. +1 −1 build.sbt
  188. +1 −1 project/BlendedActivemqBrokerstarter.scala
  189. +1 −1 project/BlendedActivemqClient.scala
  190. +2 −2 project/BlendedAkka.scala
  191. +1 −1 project/BlendedAkkaHttp.scala
  192. +2 −2 project/BlendedAkkaHttpApi.scala
  193. +1 −1 project/BlendedAkkaHttpJmsqueue.scala
  194. +1 −1 project/BlendedAkkaHttpProxy.scala
  195. +1 −1 project/BlendedAkkaHttpRestjms.scala
  196. +1 −1 project/BlendedAkkaHttpSampleHelloworld.scala
  197. +1 −1 project/BlendedCamelUtils.scala
  198. +1 −1 project/BlendedContainerContextApi.scala
  199. +1 −1 project/BlendedContainerContextImpl.scala
  200. +1 −1 project/BlendedDomino.scala
  201. +2 −2 project/BlendedFile.scala
  202. +1 −2 project/BlendedHawtioLogin.scala
  203. +2 −2 project/BlendedJettyBoot.scala
  204. +2 −2 project/BlendedJmsBridge.scala
  205. +1 −1 project/BlendedJmsSampler.scala
  206. +1 −1 project/BlendedJmsUtils.scala
  207. +1 −1 project/BlendedJmx.scala
  208. +1 −1 project/BlendedJolokia.scala
  209. +4 −4 project/BlendedLauncher.scala
  210. +1 −1 project/BlendedMgmtAgent.scala
  211. +1 −1 project/BlendedMgmtBase.scala
  212. +1 −1 project/BlendedMgmtMock.scala
  213. +1 −1 project/BlendedMgmtRepo.scala
  214. +1 −1 project/BlendedMgmtRepoRest.scala
  215. +1 −1 project/BlendedMgmtRest.scala
  216. +1 −1 project/BlendedMgmtServiceJmx.scala
  217. +1 −1 project/BlendedMgmtWs.scala
  218. +1 −1 project/BlendedPersistence.scala
  219. +1 −1 project/BlendedPersistenceH2.scala
  220. +2 −2 project/BlendedPrickle.scala
  221. +1 −1 project/BlendedPrickleAkkaHttp.scala
  222. +1 −1 project/BlendedSamplesCamel.scala
  223. +1 −1 project/BlendedSamplesJms.scala
  224. +3 −3 project/BlendedSecurity.scala
  225. +1 −1 project/BlendedSecurityAkkaHttp.scala
  226. +1 −1 project/BlendedSecurityLoginApi.scala
  227. +2 −2 project/BlendedSecurityLoginImpl.scala
  228. +1 −1 project/BlendedSecurityLoginRest.scala
  229. +2 −2 project/BlendedSecurityScep.scala
  230. +3 −4 project/BlendedSecurityScepStandalone.scala
  231. +2 −2 project/BlendedSecuritySsl.scala
  232. +2 −2 project/BlendedStreams.scala
  233. +2 −2 project/BlendedStreamsDispatcher.scala
  234. +1 −1 project/BlendedStreamsTestsupport.scala
  235. +1 −1 project/BlendedTestsupport.scala
  236. +1 −1 project/BlendedTestsupportPojosr.scala
  237. +1 −1 project/BlendedUpdater.scala
  238. +3 −3 project/BlendedUpdaterConfig.scala
  239. +1 −1 project/BlendedUpdaterRemote.scala
  240. +1 −1 project/BlendedUpdaterTools.scala
  241. +1 −3 project/ProjectSettings.scala
@@ -25,7 +25,7 @@ case class BrokerConfig (
override val retryInterval : FiniteDuration,
brokerName : String,
file : String,
withSsl : Boolean,
withSsl : Boolean
) extends ConnectionConfig {
override val enabled: Boolean = true
override val defaultUser: Option[String] = None
@@ -4,9 +4,9 @@ import java.io.File

import blended.akka.internal.BlendedAkkaActivator
import blended.jms.utils.IdAwareConnectionFactory
import blended.testsupport.{BlendedTestSupport, RequiresForkedJVM}
import blended.testsupport.pojosr.{PojoSrTestHelper, SimplePojoContainerSpec}
import blended.testsupport.scalatest.LoggingFreeSpecLike
import blended.testsupport.{BlendedTestSupport, RequiresForkedJVM}
import org.osgi.framework.BundleActivator
import org.scalatest.Matchers

@@ -13,8 +13,8 @@ import domino.DominoActivator
import org.osgi.framework.BundleActivator
import org.scalatest.Matchers

import scala.concurrent.{ExecutionContext, Future}
import scala.concurrent.duration._
import scala.concurrent.{ExecutionContext, Future}

class FailingClientActivatorSpec extends SimplePojoContainerSpec
with LoggingFreeSpecLike
@@ -11,8 +11,8 @@ import org.apache.activemq.broker.BrokerService
import org.apache.activemq.store.memory.MemoryPersistenceAdapter
import org.scalatest.{BeforeAndAfterAll, Matchers}

import scala.concurrent.{Await, ExecutionContext}
import scala.concurrent.duration._
import scala.concurrent.{Await, ExecutionContext}

class RoundtripConnectionVerifierSpec extends LoggingFreeSpec
with Matchers
@@ -1,8 +1,8 @@
package blended.akka.http.jmsqueue

import blended.akka.ActorSystemWatching
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.akka.http.jmsqueue.internal.{HttpQueueConfig, OsgiHttpQueueService}
import blended.akka.http.{HttpContext, SimpleHttpContext}
import domino.DominoActivator

class BlendedAkkaHttpJmsqueueActivator extends DominoActivator with ActorSystemWatching {
@@ -1,9 +1,9 @@
package blended.akka.http.jmsqueue.internal

import blended.util.config.Implicits._
import com.typesafe.config.Config

import scala.collection.JavaConverters._
import blended.util.config.Implicits._

object HttpQueueConfig {

@@ -1,17 +1,17 @@
package blended.akka.http.jmsqueue.internal

import scala.collection.JavaConverters._
import scala.concurrent.{ExecutionContext, Future, blocking}
import scala.util.{Failure, Success, Try}
import scala.util.control.NonFatal

import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.Route
import blended.util.logging.Logger
import javax.jms._

import scala.collection.JavaConverters._
import scala.concurrent.{ExecutionContext, Future, blocking}
import scala.util.control.NonFatal
import scala.util.{Failure, Success, Try}

trait HttpQueueService {

implicit val eCtxt : ExecutionContext
@@ -16,8 +16,8 @@ import javax.jms.ConnectionFactory
import org.apache.activemq.broker.BrokerService
import org.scalatest.{BeforeAndAfterAll, FreeSpec, FreeSpecLike, Matchers}

import scala.concurrent.{Await, ExecutionContext}
import scala.concurrent.duration._
import scala.concurrent.{Await, ExecutionContext}

class HttpQueueServiceSpec extends FreeSpec
with ScalatestRouteTest
@@ -1,11 +1,11 @@
package blended.akka.http.proxy

import blended.akka.ActorSystemWatching
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.akka.http.proxy.internal.{ProxyConfig, ProxyRoute, SimpleProxyRoute}
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.util.logging.Logger
import domino.DominoActivator
import javax.net.ssl.SSLContext
import blended.util.logging.Logger

class BlendedAkkaHttpProxyActivator extends DominoActivator with ActorSystemWatching {

@@ -1,8 +1,8 @@
package blended.akka.http.proxy.internal

import blended.akka.http.proxy.internal.RedirectHeaderPolicy.RedirectHeaderPolicy
import com.typesafe.config.Config
import blended.util.config.Implicits._
import com.typesafe.config.Config

import scala.util.Try

@@ -1,18 +1,18 @@
package blended.akka.http.proxy.internal

import scala.concurrent.Future
import scala.concurrent.duration._

import akka.actor.ActorSystem
import akka.http.scaladsl.{ConnectionContext, Http}
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.{Host, Location}
import akka.http.scaladsl.server.{RequestContext, Route}
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.{RequestContext, Route}
import akka.http.scaladsl.{ConnectionContext, Http}
import akka.stream.ActorMaterializer
import blended.util.logging.Logger
import javax.net.ssl.SSLContext

import scala.concurrent.Future
import scala.concurrent.duration._

trait ProxyRoute {

private[this] val log = Logger[ProxyRoute]
@@ -3,8 +3,6 @@ package blended.akka.http.proxy.internal
import java.io.IOException
import java.net.{InetSocketAddress, Socket}

import scala.concurrent.duration._

import akka.http.scaladsl.model.headers.Location
import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
import akka.http.scaladsl.server.Directives._
@@ -13,6 +11,8 @@ import akka.http.scaladsl.testkit.{RouteTestTimeout, ScalatestRouteTest}
import blended.util.logging.Logger
import org.scalatest.FreeSpec

import scala.concurrent.duration._

class ProxyRouteSpec extends FreeSpec with ScalatestRouteTest {

private[this] val log = Logger[ProxyRouteSpec]
@@ -1,14 +1,14 @@
package blended.akka.http.proxy.internal

import scala.concurrent.Await
import scala.concurrent.duration._

import akka.actor.ActorSystem
import akka.http.scaladsl.Http
import akka.http.scaladsl.server.Route
import akka.stream.ActorMaterializer
import blended.util.logging.Logger

import scala.concurrent.Await
import scala.concurrent.duration._

object TestServer {

private[this] val log = Logger[TestServer.type]
@@ -3,8 +3,8 @@ package blended.akka.http.restjms
import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import blended.akka.ActorSystemWatching
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.akka.http.restjms.internal.{RestJMSConfig, SimpleRestJmsService}
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.camel.utils.BlendedCamelContextFactory
import domino.DominoActivator
import javax.jms.ConnectionFactory
@@ -2,19 +2,19 @@ package blended.akka.http.restjms.internal

import java.util.concurrent.atomic.AtomicLong

import scala.concurrent.{ExecutionContext, Future}
import scala.util.{Failure, Success, Try}
import scala.util.control.NonFatal

import akka.http.scaladsl.model._
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.Route
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.Sink
import akka.util.ByteString
import blended.util.logging.Logger
import org.apache.camel.{CamelContext, Exchange, ExchangePattern}
import org.apache.camel.impl.{DefaultExchange, DefaultMessage}
import org.apache.camel.{CamelContext, Exchange, ExchangePattern}

import scala.concurrent.{ExecutionContext, Future}
import scala.util.control.NonFatal
import scala.util.{Failure, Success, Try}

trait JMSRequestor {

@@ -3,9 +3,9 @@ package blended.akka.http.restjms.internal
import blended.camel.utils.BlendedCamelContextFactory
import com.typesafe.config.ConfigFactory
import org.apache.activemq.ActiveMQConnectionFactory
import org.apache.camel.{CamelContext, Exchange, Processor}
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.component.jms.JmsComponent
import org.apache.camel.{CamelContext, Exchange, Processor}

object MockResponses {

@@ -1,16 +1,15 @@
package blended.akka.http.internal

import scala.util.{Failure, Success}

import akka.http.scaladsl.ConnectionContext
import akka.http.scaladsl.Http
import akka.http.scaladsl.{ConnectionContext, Http}
import akka.stream.ActorMaterializer
import blended.akka.ActorSystemWatching
import blended.util.config.Implicits._
import blended.util.logging.Logger
import domino.DominoActivator
import javax.net.ssl.SSLContext

import scala.util.{Failure, Success}

class BlendedAkkaHttpActivator extends DominoActivator with ActorSystemWatching {

private[this] val log = Logger[BlendedAkkaHttpActivator]
@@ -1,18 +1,13 @@
package blended.akka.http.internal

import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.PathMatchers
import akka.http.scaladsl.server.Route
import blended.akka.http.HttpContext
import blended.akka.http.SimpleHttpContext
import akka.http.scaladsl.server.{PathMatchers, Route}
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.util.logging.Logger
import domino.capsule.Capsule
import domino.capsule.CapsuleContext
import domino.capsule.{Capsule, CapsuleContext}
import domino.service_consuming.ServiceConsuming
import domino.service_watching.ServiceWatcherEvent
import domino.service_watching.ServiceWatching
import org.osgi.framework.BundleContext
import org.osgi.framework.ServiceReference
import domino.service_watching.{ServiceWatcherEvent, ServiceWatching}
import org.osgi.framework.{BundleContext, ServiceReference}

class RouteProvider {

@@ -2,14 +2,14 @@ package blended.akka.http.internal

import java.io.File

import scala.util.Try
import org.scalatest.FreeSpec
import akka.http.scaladsl.testkit.ScalatestRouteTest
import blended.akka.http.HttpContext
import blended.akka.http.SimpleHttpContext
import blended.akka.http.{HttpContext, SimpleHttpContext}
import blended.testsupport.BlendedTestSupport
import blended.testsupport.pojosr.PojoSrTestHelper
import domino.DominoActivator
import org.scalatest.FreeSpec

import scala.util.Try

class RouteProviderSpec
extends FreeSpec
@@ -1,13 +1,11 @@
package blended.akka

import akka.actor.{ActorRef, Props}
import akka.actor.{ActorRef, ActorSystem, Props}
import blended.akka.internal.ActorSystemCapsule
import blended.util.logging.Logger
import domino.DominoImplicits
import domino.capsule.CapsuleContext
import domino.capsule.{Capsule, CapsuleContext}
import org.osgi.framework.BundleContext
import akka.actor.ActorSystem
import domino.capsule.Capsule
import blended.util.logging.Logger

trait ActorSystemWatching extends DominoImplicits {

@@ -8,8 +8,8 @@ import domino.service_consuming.ServiceConsuming
import domino.service_providing.ServiceProviding
import org.osgi.framework.BundleContext

import scala.concurrent.{ExecutionContext, Future}
import scala.concurrent.duration._
import scala.concurrent.{ExecutionContext, Future}

abstract class OSGIActor(actorConfig : OSGIActorConfig)
extends Actor
@@ -5,9 +5,7 @@ import blended.akka.OSGIActorConfig
import blended.domino.TypesafeConfigWatching
import blended.util.logging.Logger
import domino.DominoImplicits
import domino.capsule.Capsule
import domino.capsule.CapsuleContext
import domino.capsule.CapsuleScope
import domino.capsule.{Capsule, CapsuleContext, CapsuleScope}
import domino.service_watching.ServiceWatching
import org.osgi.framework.BundleContext

@@ -6,8 +6,8 @@ import blended.util.logging.Logger
import domino.DominoActivator

import scala.concurrent.Await
import scala.util.control.NonFatal
import scala.concurrent.duration._
import scala.util.control.NonFatal

class BlendedAkkaActivator extends DominoActivator {

@@ -1,8 +1,9 @@
package blended.camel.utils

import scala.collection.JavaConverters._
import blended.container.context.api.ContainerIdentifierService

import scala.collection.JavaConverters._

trait CamelContextPropertyProvider {
def contextProperties : Map[String, String] = Map.empty
}
@@ -1,11 +1,11 @@
package blended.container.context.impl.internal

import scala.util.control.NonFatal

import blended.container.context.api.ContainerIdentifierService
import blended.util.logging.Logger
import domino.DominoActivator

import scala.util.control.NonFatal

class ContainerContextActivator extends DominoActivator {

private[this] val log = Logger[ContainerContextActivator]
@@ -4,7 +4,7 @@ import java.io.File
import java.util.Properties

import blended.container.context.api.ContainerContext
import blended.security.crypto.{ContainerCryptoSupport, BlendedCryptoSupport}
import blended.security.crypto.{BlendedCryptoSupport, ContainerCryptoSupport}
import blended.updater.config.{LocalOverlays, OverlayRef, RuntimeConfig}
import blended.util.logging.Logger
import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions}
@@ -3,14 +3,14 @@ package blended.container.context.impl.internal
import java.io.File
import java.nio.file.Files

import scala.collection.JavaConverters._
import scala.util.{Success, Try}
import blended.container.context.api.{ContainerContext, ContainerIdentifierService}
import blended.updater.config.RuntimeConfig
import blended.util.logging.Logger
import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions}

import scala.beans.BeanProperty
import scala.collection.JavaConverters._
import scala.util.{Success, Try}

class ContainerIdentifierServiceImpl(
@BeanProperty override val containerContext : ContainerContext
@@ -1,8 +1,8 @@
package blended.jetty.boot.internal

import javax.net.ssl.SSLContext
import domino.DominoActivator
import javax.management.{MBeanServer, ObjectName}
import javax.net.ssl.SSLContext
import org.eclipse.jetty.jmx.MBeanContainer
import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator

0 comments on commit c3cc55d

Please sign in to comment.
You can’t perform that action at this time.