Merge pull request #1144 from eclipse-passage/1141

1141 FLS 2.6.0

bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF

@@ -21,5 +21,5 @@ Export-Package: org.eclipse.passage.lbc.internal.base;x-friends:="org.eclipse.pa
  org.eclipse.passage.lbc.internal.base.mine;x-friends:="org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests"
 Import-Package: org.apache.logging.log4j;version="2.17.1"
 Bundle-ActivationPolicy: lazy
-Provide-Capability: licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent";version="2.0.0";name="FLS: Concurrent access to a feature grant for several users";level="info";provider="Eclipse Passage",
- licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent.full";version="2.0.0";name="FLS: Concurrent access to a feature grant for any amount of users";level="error";provider="Eclipse Passage"
+Provide-Capability: licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent";version="2.6.0";name="FLS: Concurrent access to a feature grant for several users";level="info";provider="Eclipse Passage",
+ licensing.feature;licensing.feature="org.eclipse.passage.lbc.acquire.concurrent.full";version="2.6.0";name="FLS: Concurrent access to a feature grant for any amount of users";level="error";provider="Eclipse Passage"

bundles/org.eclipse.passage.lbc.fls.seal/OSGI-INF/org.eclipse.passage.lbc.fls.product_2.6.0.pub

@@ -1,19 +1,19 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: BCPG v1.65
+Version: BCPG v1.70
 
-mI0EYLet0wEEAJtuzI5TjBkw/frB6lGC0XD0GmJZndJ5c2bvNm8KVJGSP58TRLKw
-BYdCKxRtGILAyrdTxtnD+m30lKQsLwiQZw7z3MBeIx6/van67gEz3ZbepR/8807T
-uK/WIRFKf/M9Kyfh1OH8vmPbUrbyd/hbI8OEbSJ1NWF35RLU4RJe8KzXABEBAAG0
-I29yZy5lY2xpcHNlLnBhc3NhZ2UubGJjLmZscy5wcm9kdWN0iKIEEwECAAwFAmC3
-rdMFCQAAA+gACgkQEu1qloTVVet8vwP+PkFr4HqjGPkZ4nPhKfZkXqguuk2hNU5I
-3g1pFxrY5YPGSBPoqQtIrgh1kmP8FGCZsKkvmfofbGwRijyYbR6tRChfQf5iFbT9
-F1YtqX4cYUESbSxx1/6Pc3TSRXRXEL8cz+DQiUdwv2m5AFsxs80uUQ2/8YumD96G
-egIwvaFCeGu4jQRgt63TAQQAm27MjlOMGTD9+sHqUYLRcPQaYlmd0nlzZu82bwpU
-kZI/nxNEsrAFh0IrFG0YgsDKt1PG2cP6bfSUpCwvCJBnDvPcwF4jHr+9qfruATPd
-lt6lH/zzTtO4r9YhEUp/8z0rJ+HU4fy+Y9tStvJ3+Fsjw4RtInU1YXflEtThEl7w
-rNcAEQEAAYiiBBgBAgAMBQJgt63TBQkAAAPoAAoJEBLtapaE1VXr1M8EAJNWBRP7
-u+HE9kZgs5HlL7P1QpHsm4oT28KwZ0Acbf6GXEFAMZKZbRm9e8MuUfeVbMKqqWZK
-MOlhmp9VaqUFR9RuaqL+7L5vQP6F93birCy7V4DzaEaaW/KV2qWeaanae2VWV4Hv
-MjHET65/NO0vukErIG8nrKQh7kS2jWwADGeY
-=UZu5
+mI0EY2dmYgEEAM2lvX3zT9v2d9XO8z3+ojYf8l2+04OURQlwp0Vf4vy1VWnadhju
+WOKTgFKLl6wjmHCWY9qJvyuGL9C1sL1ZLCo9nd5MAN29DFdLMOkZPCAFYDNVmBb1
+39qRKbKetZt0DefYzXT3MRoNPGrUQ0/OnvfWDTUwogrl4Q7U10U40TgZABEBAAG0
+I29yZy5lY2xpcHNlLnBhc3NhZ2UubGJjLmZscy5wcm9kdWN0iKIEEwECAAwFAmNn
+ZmIFCQAAA+gACgkQJSVPXgiMWOUOmAQArftYCGnh8WK+xslvb+V3mA83IdL7zLor
+cUCD+a3gRZiJbhF06ppSGTUZAFpqWZqJRPQQSQj4XdJGxXCyCXtgd0pVBRsxYaQ4
+Rd/dCF5VvKH8Q2yKcU5/4YaFD5OlpqGLG7GwxIxz0/iGyBIVQeJgdd89ZzzVTuKE
+EMeZ/TOWS/O4jQRjZ2ZiAQQAzaW9ffNP2/Z31c7zPf6iNh/yXb7Tg5RFCXCnRV/i
+/LVVadp2GO5Y4pOAUouXrCOYcJZj2om/K4Yv0LWwvVksKj2d3kwA3b0MV0sw6Rk8
+IAVgM1WYFvXf2pEpsp61m3QN59jNdPcxGg08atRDT86e99YNNTCiCuXhDtTXRTjR
+OBkAEQEAAYiiBBgBAgAMBQJjZ2ZiBQkAAAPoAAoJECUlT14IjFjl7p4D/iI0HDRy
+tbC3Ou33ADeTm8H0DluxiKfDvyeosSdZTwihb1k2dkiUIagadY93GIT3JgG1bBcw
+KHcbYZZGlC5SRT7PK12wpbFwvTmAsgFt6OaU20YPoUsK5yRjI/Wv2UWTPiF38IV1
+i7SvNtWdUmLT4l6kb4AUR1ddvRT609HGu5SG
+=ubqY
 -----END PGP PUBLIC KEY BLOCK-----

bundles/org.eclipse.passage.lbc.fls/META-INF/MANIFEST.MF

@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lbc.fls
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lbc.fls;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
- org.eclipse.passage.lbc.jetty;bundle-version="0.5.100"
+ org.eclipse.passage.lbc.jetty;bundle-version="0.0.0"
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lbc.fls/OSGI-INF/l10n/bundle.properties

@@ -1,6 +1,6 @@
 #Properties file for org.eclipse.passage.lbc.fls
 ###############################################################################
-# Copyright (c) 2018, 2021 ArSysOp and others
+# Copyright (c) 2018, 2022 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -13,7 +13,7 @@
 ###############################################################################
 Bundle-Name = Passage LBC FLS
 Bundle-Vendor = Eclipse Passage
-Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\
+Bundle-Copyright = Copyright (c) 2018, 2022 ArSysOp and others.\n\
 \n\
 This program and the accompanying materials are made\n\
 available under the terms of the Eclipse Public License 2.0\n\

bundles/org.eclipse.passage.lbc.fls/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2018, 2021 ArSysOp and others
+	Copyright (c) 2018, 2022 ArSysOp and others
 
 	This program and the accompanying materials are made available under the
 	terms of the Eclipse Public License 2.0 which is available at

bundles/org.eclipse.passage.lbc.jetty/src/org/eclipse/passage/lbc/internal/jetty/FlsJettyActivator.java

@@ -53,8 +53,11 @@ protected void configureLogging() {
 	}
 
 	private InputStream logConfig() throws Exception {
-		Bundle bundle = FrameworkUtil.getBundle(getClass());
-		return new FileFromBundle(bundle, "config/log4j2.xml").get(); //$NON-NLS-1$
+		return new FileFromBundle(bundle(), "config/log4j2.xml").get(); //$NON-NLS-1$
+	}
+
+	private Bundle bundle() {
+		return FrameworkUtil.getBundle(getClass());
 	}
 
 	@Override

products/org.eclipse.passage.lbc.fls.product/common-license.licen

@@ -1,25 +1,24 @@
 -----BEGIN PGP MESSAGE-----
-Version: BCPG v1.65
+Version: BCPG v1.70
 
-owJ4nNVWT2gUVxxOjMW6JVCKBys9TCe1ger82ZmtZCe7GkkORiIGrJJeal7evNl9
-OjNvfO9NNkEItLUieLE9FA8qlIJepNBSqyIoQkuxPbSI7bH00h5SFKWn0hT9ze7s
-JhuzxiQGKuwe3m9+75vv+31vPt6pzo62TPsrdw99euyX/X+1/zg9to6WQsaJO3r5
-6+uFHROBr4wTLigLi2pWN1WFhJi5NCwV1Z37+gcH1R3bOzMFxks6wT6NBNEjJAQq
-Ed2n2BmGrSxE/hDFJBRkGOHDykRAnQaklUDCS0LhQL2olqWMHMOoVCo6C0o64Boj
-ewYbLaK5pWJXOyzTzELb0D5cJgHSaCgkCjGp72pBrgmp/jyBS3sM6En+CXFhAFGg
-CloVpZAWFeqSUFKPEl5UXctCrufaWj6bs7WcZfZoCFmmlssjkvUstM2z86pChYjJ
-AJIElJtWVjO3aab1Tjbv5LKOndNt++0tpm3CSCIfwXQWYu75QscsCFh4cA4nYBVx
-5sZYNrFaUPoYroKk/aoy1wzAM+qA48inrgIzd+RkRFqAgckHkj4qJ8Fsytx+nwni
-qorHWdCk0jSd6k83TTNVGQNRv9pktWxq0BFwMJGMOUkLUEJScjoWSyKUEAVAsTpf
-ricL0IX8uBVthnUWEY4k441BGIsDp6NqYDdP7Akba0cGPpuDcDZlLBoIIvY8iilY
-NhcmQhwqjfUzA15c2nRLbas474UUP0PNKzB0lWUvLHw50iH0WolfofzVHoDx+GGf
-X5pXKBjzs6AQC8Kbku8QK4e6y0gfwgFJAlNNqe+GB8oAIymNQj3ia6sSR6EUS072
-rtkY9kiV2JJjeFZsasoeJHF5fjgrPPZBBDkSUxj7XK8LRvrmFcb3zW+XFeDQlF8k
-wBOPdsaynMwFIwmqlBqzMuJuBQyGy8VExImoCWZC91BA/cniWw2vavaszKrssqxC
-GEbOk5MU4pgnh/F/49jz4FfBWMIVEfpP3Fzb1p5p2/LCmuQe+sZrT/EFtWXWv1y/
-yI7ijocH7gx8+fHxj9Z2fa8Nf/Z7ZvTksb1Xex/8tNH88+jWa1h9v3um55tfew9f
-3vX6ro7d7+k3LuQysuvsRatzwpnqHvrk6M9y6o9L0+fufSDvz9x/6b++qdyLm37Q
-vvjburXht43vvrr3Vte/J747P9LXf+TDf9rfvNI/U7p98avPN9/pvq2cubTBPv0I
-TISqTw==
-=Iapa
+owJ4nO1Wy2/URhjflPcKVECqONCHZZpLIz/2kWSzcspbVapETZMQEYESZsfj3QHb
+Y2bGbMKFExIgKopEu4rUU6UeeqnUXJJCewgSHEDAfwBIKEgECY4c6IHPu95lNwql
+STn0gGQfZvzNz7/H98n+fsuaRLKtvf2b8Y0XDy+03V4sbKBFn3Fi4+L9n6zdk56r
+nCJcUOb3qindVBXiY2ZTv9ir7h3e39en7v5yS9JivKgT7NJAED1AQqAi0V2K84Nw
+lPnI7aeY+IIMInxCmfRovgGZjiDhJb7Iw36vWpIyyBtGuVzWmVfUAdc4PNDXKBGt
+JeVMtSJtmiko6x/GJeIhjfpCIh+T+qk3kGtBqj+P4OIaA2qiOyIuDCAKVEGroljx
+pkJt4kvqUMJBSCcyUU9np0bsblvLdjs5LWcXOrUcdrIFpydlF8xuVaFChOQAkgQO
+mOm0lkppZtdIqicPVyanZ7tyHWbGBEsCF4E7yzF3XKFj5nnMn0jrXXVOwCrgzA6x
+bGG1rPQCroLE9arSFEaEZ9QBTyGX2gp4npdTAXkDGIQ8GtVROQVhU2bvd5kgtqo4
+nHktKk0zX7100zRjlSEQdatFGc3MaJnUMkUNOgIaE8mQk3gDtpCUnBZCSYTiIw8o
+Vv3lerQAXcgNYY+HOuJiSrAAfOM283UXs4Z64+1osT8NwLSeabLpHw7W+gRmZQIa
+UoaigSBCx6GYQk7NMAHisNNYrwYYWn856BWIW1yq7p3bbLTotIyluVqhILyli4+z
+kq/bjOxB2CNR86sxj6/hgXKAkRjeqo9rbVXkyJdixVO66/VIOaRKbMUj9VpsbO8A
+kri0dNAUHroggpwMKXjYnJhlxG/+n45ilNDeUJYiVzCSoEmp8SohbpchXvhMTAac
+iJpcJnQHedSd6v2ikVQtnP8WVGpVQSEMhvOoj3wc8qgV3+fVlNfg2wKzjBV87aH+
+3PzaRFsy0bHug+iX4vOP/8UAJZKbttb/SYYurU1UNu7se5DYMLzvQ3tu/hN3ZHF2
+5tCZChk/MtBvjX1358+zl8Zmrl64PPtV8ea10dL5y+O/Tl95/vju4+S2X34Ymnvx
+18HP+j/lT/6+/kd25KNjO7ZX1lcmXy7M/75wa+uzR0fGssdPT5+8sb6n8q368tzR
+zeU7yacLV8//SO+J3zIPf74ZmhOvAIQ4+h4=
+=hTHa
 -----END PGP MESSAGE-----