Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit 2693874

Browse files
kpiot123kpiot123
authored
Merge pull request #353 from xenit-eu/DEVEM-502
DEVEM-502 Release v2.1.4
2 parents f5884a6 + 7b49cef commit 2693874

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Version template:
2020
### YANKED (for reverted functionality in)
2121
-->
2222
# Dynamic Extensions For Alfresco Changelog
23-
## [2.1.4] - unreleased
23+
## [2.1.4] - 2022-07-13
2424
### Fixed
2525
* [#350](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/350) Added missing curly brace in osgi framework spring context
2626

‎alfresco-integration/src/main/java/com/github/dynamicextensionsalfresco/osgi/Configuration.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ public File getSystemPackageCache() {
5555
return this.systemPackageCache;
5656
}
5757

58-
public String getBootdelegation() {
59-
return bootdelegation;
58+
public String getBootDelegation() {
59+
return bootDelegation;
6060
}
6161

62-
public void setBootdelegation(String bootdelegation) {
63-
this.bootdelegation = bootdelegation;
62+
public void setBootDelegation(String bootDelegation) {
63+
this.bootDelegation = bootDelegation;
6464
}
6565

66-
private String bootdelegation = null;
66+
private String bootDelegation = null;
6767

6868

6969
private static File createTempFile(String child) {

‎alfresco-integration/src/main/java/com/github/dynamicextensionsalfresco/osgi/FrameworkConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public Map<String, String> toMap() {
5050
configuration.put(FRAMEWORK_SYSTEMPACKAGES_EXTRA,
5151
createSystemPackagesConfiguration(getAdditionalSystemPackages()));
5252
}
53-
if (getBootdelegation() != null) {
54-
configuration.put(FRAMEWORK_BOOTDELEGATION, getBootdelegation());
53+
if (getBootDelegation() != null) {
54+
configuration.put(FRAMEWORK_BOOTDELEGATION, getBootDelegation());
5555
}
5656
return configuration;
5757
}
@@ -90,8 +90,8 @@ public File getStorageDirectory() {
9090
return getConfiguration().getStorageDirectory();
9191
}
9292

93-
public String getBootdelegation() {
94-
return getConfiguration().getBootdelegation();
93+
public String getBootDelegation() {
94+
return getConfiguration().getBootDelegation();
9595
}
9696

9797
public boolean isFlushBundleCacheOnFirstInit() {

‎alfresco-integration/src/main/resources/META-INF/spring/osgi-container/framework-context.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd">
1212
<property name="hotDeployEnabled" value="${osgi.container.hot-deploy:true}" />
1313
<property name="repositoryBundlesEnabled" value="${osgi.container.repository-bundles:true}" />
1414
<property name="storageDirectory" value="${osgi.container.storage-directory:#{null}}" />
15-
<property name="bootdelegation" value="${osgi.container.bootdelegation:#{null}}" />
15+
<property name="bootDelegation" value="${osgi.container.boot-delegation:#{null}}" />
1616

1717
<!-- DISABLE by default, see: https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/281 -->
1818
<property name="systemPackageCacheMode" value="${osgi.container.system-package-cache.mode:DISABLE}" />

‎documentation/Configuration.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ determine the root of the classpath from the location of 'alfresco-global.proper
2020

2121
## Configuration settings
2222

23-
| Description | Default | Example |
24-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------| -------------------
25-
| Allow restart of the container: useful for development | true | osgi.container.restartable=true/false |
26-
| Enable starting bundles stored in the repository. | true | osgi.container.repository-bundles=true/false |
27-
| Hot-deploy bundles on a running Alfresco If disabled, only classpath bundles and/or optionally repository bundles will be loaded. | true | osgi.container.hot-deploy=true/false |
28-
| Configures the OSGI framework's storage directory. This can be either a relative or absolute path. Specifying an absolute path is recommended. (absolute or relative path) | tmp (relative to the current working directory) | osgi.container.storage-directory=tmp |
29-
| Configures the OSGI framework's directory from which to automatically install or uninstall bundles. (absolute or relative path) | dynamic-extensions (relative to the current working directory) | osgi.container.bundle-directory=dynamic-extensions |
23+
| Description | Default | Example |
24+
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------|------------------------------------------------------------------
25+
| Allow restart of the container: useful for development | true | osgi.container.restartable=true/false |
26+
| Enable starting bundles stored in the repository. | true | osgi.container.repository-bundles=true/false |
27+
| Hot-deploy bundles on a running Alfresco If disabled, only classpath bundles and/or optionally repository bundles will be loaded. | true | osgi.container.hot-deploy=true/false |
28+
| Configures the OSGI framework's storage directory. This can be either a relative or absolute path. Specifying an absolute path is recommended. (absolute or relative path) | tmp (relative to the current working directory) | osgi.container.storage-directory=tmp |
29+
| Configures the OSGI framework's directory from which to automatically install or uninstall bundles. (absolute or relative path) | dynamic-extensions (relative to the current working directory) | osgi.container.bundle-directory=dynamic-extensions |
3030
| Web application classpath scanning behaviour <br><br> ENABLE: Use existing cache or create a new cache if a: none exists or b: cache ts < WEB-INF/lib ts. Default setting. <br><br> DISABLE: Disable the cache. Rescans the WEB-INF/lib directory at every startup boot, but does not persist it. <br><br> UPDATE: Force update of the existing cache. | DISABLE | osgi.container.system-package-cache.mode = ENABLE/DISABLE/UPDATE |
31-
| Configure the OSGI framework's bootdelegation. This property is added for supporting [AppDynamics](https://docs.appdynamics.com/21.3/en/application-monitoring/install-app-server-agents/java-agent/install-the-java-agent/agent-installation-by-java-framework/osgi-infrastructure-configuration). | | osgi.container.bootdelegation=com.singularity.*|
31+
| Configure the OSGI framework's boot delegation. This property is added for supporting [AppDynamics](https://docs.appdynamics.com/21.3/en/application-monitoring/install-app-server-agents/java-agent/install-the-java-agent/agent-installation-by-java-framework/osgi-infrastructure-configuration). | | osgi.container.boot-delegation=com.singularity.* |
3232

0 commit comments

Comments
 (0)