This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch jakarta-servlet-6
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from 7462920294 No need to branch webconsole l18n modules
new 60fbd5ea70 No need to branch depback plugin
new 1d5b52db1c Port changes from main branch
new a0621b6f95 Port changes from main branch
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webconsole-plugins/deppack/changelog.txt | 6 -
webconsole-plugins/deppack/pom.xml | 154 -----------
.../plugins/deppack/internal/Activator.java | 98 -------
.../plugins/deppack/internal/WebConsolePlugin.java | 260 ------------------
.../main/resources/OSGI-INF/l10n/bundle.properties | 40 ---
.../resources/OSGI-INF/l10n/bundle_bg.properties | 40 ---
.../resources/OSGI-INF/l10n/bundle_de.properties | 40 ---
.../resources/OSGI-INF/l10n/bundle_ru.properties | 40 ---
.../deppack/src/main/resources/res/plugin.css | 19 --
.../deppack/src/main/resources/res/plugin.html | 55 ----
.../deppack/src/main/resources/res/plugin.js | 172 ------------
webconsole/pom.xml | 7 +
.../felix/webconsole/DefaultVariableResolver.java | 2 +
.../apache/felix/webconsole/VariableResolver.java | 1 +
.../felix/webconsole/WebConsoleConstants.java | 3 +
.../apache/felix/webconsole/WebConsoleUtil.java | 302 ---------------------
.../felix/webconsole/i18n/LocalizationHelper.java | 10 +-
.../internal/WebConsolePluginAdapter.java | 16 +-
.../webconsole/internal/compendium/LogServlet.java | 8 +-
.../internal/configuration/ConfigManager.java | 43 +--
.../internal/core/BaseUpdateInstallHelper.java | 2 +-
.../webconsole/internal/core/BundlesServlet.java | 57 ++--
.../webconsole/internal/core/InstallHelper.java | 2 +-
.../core/PermissionsConfigurationPrinter.java | 6 +-
.../core/ServicesConfigurationPrinter.java | 64 +----
.../webconsole/internal/core/ServicesServlet.java | 50 ++--
.../internal/core/ServicesUsedInfoProvider.java | 9 +-
.../webconsole/internal/core/UpdateHelper.java | 2 +-
.../internal/filter/FilteringResponseWrapper.java | 41 +--
.../internal/filter/ResourceFilteringWriter.java | 9 +-
.../internal/i18n/CombinedEnumeration.java | 26 +-
.../internal/i18n/CombinedResourceBundle.java | 2 +-
.../i18n/ConsolePropertyResourceBundle.java | 26 +-
.../internal/i18n/ResourceBundleCache.java | 87 +++---
.../internal/misc/ConfigurationRender.java | 2 +-
.../webconsole/internal/misc/LicenseServlet.java | 13 +-
.../internal/misc/SystemPropertiesPrinter.java | 9 +-
.../servlet}/AbstractWebConsolePlugin.java | 95 ++++---
.../JakartaServletAdapter.java} | 202 ++++++--------
.../webconsole/internal/servlet/OsgiManager.java | 12 +-
.../felix/webconsole/internal/servlet/Plugin.java | 11 +-
.../webconsole/internal/servlet/PluginHolder.java | 25 +-
.../servlet}/SimpleWebConsolePlugin.java | 19 +-
.../internal/servlet/WebConsoleUtil.java | 169 ++++++++++++
.../webconsole/internal/system/VMStatPlugin.java | 12 +-
.../felix/webconsole/servlet/AbstractServlet.java | 201 ++++++++++++++
.../servlet/RequestVariableResolver.java | 62 +++++
.../felix/webconsole/servlet/ServletConstants.java | 75 +++++
.../webconsole/{i18n => servlet}/package-info.java | 2 +-
.../servlet}/AbstractWebConsolePluginTest.java | 8 +-
.../internal/servlet/OsgiManagerTest.java | 4 +-
51 files changed, 908 insertions(+), 1712 deletions(-)
delete mode 100755 webconsole-plugins/deppack/changelog.txt
delete mode 100644 webconsole-plugins/deppack/pom.xml
delete mode 100644
webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/Activator.java
delete mode 100644
webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java
delete mode 100644
webconsole-plugins/deppack/src/main/resources/OSGI-INF/l10n/bundle.properties
delete mode 100644
webconsole-plugins/deppack/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
delete mode 100644
webconsole-plugins/deppack/src/main/resources/OSGI-INF/l10n/bundle_de.properties
delete mode 100644
webconsole-plugins/deppack/src/main/resources/OSGI-INF/l10n/bundle_ru.properties
delete mode 100644 webconsole-plugins/deppack/src/main/resources/res/plugin.css
delete mode 100644
webconsole-plugins/deppack/src/main/resources/res/plugin.html
delete mode 100644 webconsole-plugins/deppack/src/main/resources/res/plugin.js
delete mode 100755
webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java
rename webconsole/src/main/java/org/apache/felix/webconsole/{ =>
internal/servlet}/AbstractWebConsolePlugin.java (93%)
copy
webconsole/src/main/java/org/apache/felix/webconsole/internal/{WebConsolePluginAdapter.java
=> servlet/JakartaServletAdapter.java} (52%)
rename webconsole/src/main/java/org/apache/felix/webconsole/{ =>
internal/servlet}/SimpleWebConsolePlugin.java (92%)
create mode 100755
webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/WebConsoleUtil.java
create mode 100755
webconsole/src/main/java/org/apache/felix/webconsole/servlet/AbstractServlet.java
create mode 100755
webconsole/src/main/java/org/apache/felix/webconsole/servlet/RequestVariableResolver.java
create mode 100755
webconsole/src/main/java/org/apache/felix/webconsole/servlet/ServletConstants.java
copy webconsole/src/main/java/org/apache/felix/webconsole/{i18n =>
servlet}/package-info.java (95%)
rename webconsole/src/test/java/org/apache/felix/webconsole/{ =>
internal/servlet}/AbstractWebConsolePluginTest.java (95%)
