Merge branch 'develop' into stable

This commit is contained in:
2024-08-07 11:43:31 -04:00
15 changed files with 53 additions and 37 deletions

View File

@@ -12,10 +12,10 @@
<name>${shortname} ACS All-in-one Parent Project</name> <name>${shortname} ACS All-in-one Parent Project</name>
<properties> <properties>
<alfresco.sdk.version>4.2.0</alfresco.sdk.version> <alfresco.sdk.version>4.8.0</alfresco.sdk.version>
<edition>community</edition> <edition>community</edition>
<alfresco.platform.version>6.2.0-ga</alfresco.platform.version> <alfresco.platform.version>23.2.0</alfresco.platform.version>
<alfresco.share.version>6.2.2.2</alfresco.share.version> <alfresco.share.version>23.2.0.72</alfresco.share.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>

View File

@@ -221,9 +221,9 @@
<acs-platform.port>8080</acs-platform.port> <acs-platform.port>8080</acs-platform.port>
<!-- versions --> <!-- versions -->
<acs-postgres.version>9.6</acs-postgres.version> <acs-postgres.version>12</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version> <acs-activemq.version>5.18.4</acs-activemq.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version> <tomcat-rad.version>9-2.1</tomcat-rad.version>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

View File

@@ -15,8 +15,8 @@
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<alfresco.sdk.version>4.2.0</alfresco.sdk.version> <alfresco.sdk.version>4.8.0</alfresco.sdk.version>
<alfresco.platform.version>6.2.0-ga</alfresco.platform.version> <alfresco.platform.version>23.2.0</alfresco.platform.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

View File

@@ -30,6 +30,8 @@ import org.springframework.stereotype.Component;
/** /**
* This class is an example of how you can use the Alfresco Java Public API in Alfresco Actions. * This class is an example of how you can use the Alfresco Java Public API in Alfresco Actions.
*
* The bean must be declared in the XML and not through annotations.
*/ */
public class ExampleActionExecuter extends ActionExecuterAbstractBase { public class ExampleActionExecuter extends ActionExecuterAbstractBase {
@@ -45,9 +47,8 @@ public class ExampleActionExecuter extends ActionExecuterAbstractBase {
} }
@Override @Override
protected void executeImpl(Action action, NodeRef actionedUponNoderef) { protected void executeImpl(Action action, NodeRef actionedUponNodeRef) {
if (this.logger.isTraceEnabled()) this.logger.trace("executeImpl({})", actionedUponNodeRef);
this.logger.trace("executeImpl('" + actionedUponNoderef + "')");
String value = (String)action.getParameterValue("example.param"); String value = (String)action.getParameterValue("example.param");
// TODO do some work // TODO do some work

View File

@@ -14,11 +14,19 @@
*/ */
package ${package}; package ${package};
import java.io.Serializable;
import java.util.Map;
import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy; import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy;
import org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy;
import org.alfresco.repo.policy.annotation.Behaviour;
import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency; import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.namespace.QName;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +37,8 @@ import org.springframework.stereotype.Component;
* This class is an example of how you can use the Alfresco Java Public API when Alfresco triggers an event. * This class is an example of how you can use the Alfresco Java Public API when Alfresco triggers an event.
*/ */
@Component @Component
public class ExampleEventListener extends AbstractLifecycleBean implements OnCreateNodePolicy { @BehaviourBean
public class ExampleEventListener extends AbstractLifecycleBean implements OnCreateNodePolicy, OnUpdatePropertiesPolicy {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -64,9 +73,17 @@ public class ExampleEventListener extends AbstractLifecycleBean implements OnCre
*/ */
@Override @Override
public void onCreateNode(ChildAssociationRef childAssocRef) { public void onCreateNode(ChildAssociationRef childAssocRef) {
this.logger.trace("onCreateNode('" + childAssocRef.getChildRef() + "')"); this.logger.trace("onCreateNode({})", childAssocRef.getChildRef());
// TODO do some work // TODO do some work
} }
@Behaviour(kind = BehaviorKind.CLASS, NotificationFrequency = NotificationFrequency.FIRST_EVENT)
public void onUpdateProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after) {
this.logger.trace("onUpdateProperties({})", nodeRef);
// TODO do some work
}
} }

View File

@@ -46,7 +46,6 @@ public class ExampleGetWebScript extends AbstractWebScript {
*/ */
@Override @Override
public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException { public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException {
if (this.logger.isTraceEnabled())
this.logger.trace("execute()"); this.logger.trace("execute()");
// TODO do some work // TODO do some work

View File

@@ -23,6 +23,8 @@ import org.springframework.stereotype.Component;
/** /**
* This class is an example of how you can use the Alfresco Java Public API to extend the JavaScript engine. * This class is an example of how you can use the Alfresco Java Public API to extend the JavaScript engine.
*
* The bean must be declared in the XML and not through annotations.
*/ */
public class ExampleJavaScriptRootObject extends BaseProcessorExtension { public class ExampleJavaScriptRootObject extends BaseProcessorExtension {
@@ -40,8 +42,7 @@ public class ExampleJavaScriptRootObject extends BaseProcessorExtension {
* The `example` root name comes from the `module-context.xml` file. * The `example` root name comes from the `module-context.xml` file.
*/ */
public String getMessage(String messageKey) { public String getMessage(String messageKey) {
if (this.logger.isTraceEnabled()) this.logger.trace("getMessage({})", messageKey);
this.logger.trace("getMessage('" + messageKey + "')");
return this.serviceRegistry.getDictionaryService().getMessage(messageKey); return this.serviceRegistry.getDictionaryService().getMessage(messageKey);
} }

View File

@@ -61,8 +61,7 @@ public class ExampleJob implements Job {
@Override @Override
public void execute(JobExecutionContext context) throws JobExecutionException { public void execute(JobExecutionContext context) throws JobExecutionException {
if (this.logger.isTraceEnabled()) this.logger.trace("execute({})", context.getFireInstanceId());
this.logger.trace("execute('" + context.getFireInstanceId() + "')");
// provide some authority within the Alfresco context // provide some authority within the Alfresco context
AuthenticationUtil.runAsSystem(new RunAsWork<Void>() { AuthenticationUtil.runAsSystem(new RunAsWork<Void>() {
@@ -81,8 +80,7 @@ public class ExampleJob implements Job {
} }
public void fire(JobExecutionContext context) throws JobExecutionException { public void fire(JobExecutionContext context) throws JobExecutionException {
if (this.logger.isTraceEnabled()) this.logger.trace("fire({})", context.getFireInstanceId());
this.logger.trace("fire('" + context.getFireInstanceId() + "')");
// TODO do some work // TODO do some work
} }

View File

@@ -85,7 +85,7 @@ The following properties are only intended to be defined by BeeDK components.
| `beedk.rad.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) tile **AFTER** this tile. | | `beedk.rad.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) tile **AFTER** this tile. |
| `beedk.rad.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) tile **AFTER** this tile. | | `beedk.rad.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) tile **AFTER** this tile. |
| `beedk.rad.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) tile **AFTER** this tile. | | `beedk.rad.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) tile **AFTER** this tile. |
| `acs-api-explorer.version` | | `6.2.0` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. | | `acs-api-explorer.version` | | `23.2.0` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. |
### Other APIs ### Other APIs

View File

@@ -266,11 +266,11 @@
<acs-platform.debugger.port>8000</acs-platform.debugger.port> <acs-platform.debugger.port>8000</acs-platform.debugger.port>
<!-- versions --> <!-- versions -->
<acs-api-explorer.version>6.2.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version --> <acs-api-explorer.version>23.2.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
<acs-aos.war.version>1.3.2.1</acs-aos.war.version> <acs-aos.war.version>1.3.2.1</acs-aos.war.version>
<acs-postgres.version>9.6</acs-postgres.version> <acs-postgres.version>12</acs-postgres.version>
<acs-activemq.version>5.15.8</acs-activemq.version> <acs-activemq.version>5.18.4</acs-activemq.version>
<tomcat-rad.version>9-1.4</tomcat-rad.version> <tomcat-rad.version>9-2.1</tomcat-rad.version>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

View File

@@ -15,9 +15,9 @@
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<alfresco.sdk.version>4.2.0</alfresco.sdk.version> <alfresco.sdk.version>4.8.0</alfresco.sdk.version>
<alfresco.platform.version>6.2.0-ga</alfresco.platform.version> <alfresco.platform.version>23.2.0</alfresco.platform.version>
<alfresco.share.version>6.2.2</alfresco.share.version> <alfresco.share.version>23.2.0.72</alfresco.share.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

View File

@@ -171,7 +171,7 @@
<acs-share.debugger.port>8100</acs-share.debugger.port> <acs-share.debugger.port>8100</acs-share.debugger.port>
<!-- versions --> <!-- versions -->
<tomcat-rad.version>9-1.4</tomcat-rad.version> <tomcat-rad.version>9-2.1</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile --> <!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId> <alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -166,7 +166,7 @@
<acs-share.port>8180</acs-share.port> <acs-share.port>8180</acs-share.port>
<!-- versions --> <!-- versions -->
<tomcat-rad.version>9-1.4</tomcat-rad.version> <tomcat-rad.version>9-2.1</tomcat-rad.version>
<!-- configuring beedk-acs-webapp-artifact-tile --> <!-- configuring beedk-acs-webapp-artifact-tile -->
<alfresco.war.artifactId>share</alfresco.war.artifactId> <alfresco.war.artifactId>share</alfresco.war.artifactId>

View File

@@ -183,8 +183,8 @@
<aps.debugger.port>8000</aps.debugger.port> <aps.debugger.port>8000</aps.debugger.port>
<!-- versions --> <!-- versions -->
<aps-postgres.version>9.6</aps-postgres.version> <aps-postgres.version>12</aps-postgres.version>
<aps.version>1.11.5</aps.version> <aps.version>2.4.4</aps.version>
<tomcat-rad.version>9-2.1</tomcat-rad.version> <tomcat-rad.version>9-2.1</tomcat-rad.version>
<!-- results --> <!-- results -->

View File

@@ -13,11 +13,11 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.release.source>11</maven.release.source> <maven.release.source>11</maven.release.source>
<alfresco.sdk.version>5.0.0</alfresco.sdk.version> <alfresco.restapi.version>5.0.0</alfresco.restapi.version>
<!-- for RAD environment --> <!-- for RAD environment -->
<edition>community</edition> <edition>community</edition>
<alfresco.platform.version>6.2.0-ga</alfresco.platform.version> <alfresco.platform.version>23.2.0</alfresco.platform.version>
<!-- for Docker deployment --> <!-- for Docker deployment -->
<docker.image.registry>${dockerRegistryHost}</docker.image.registry> <docker.image.registry>${dockerRegistryHost}</docker.image.registry>
@@ -30,13 +30,13 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-java-rest-api-spring-boot-starter</artifactId> <artifactId>alfresco-java-rest-api-spring-boot-starter</artifactId>
<version>${alfresco.sdk.version}</version> <version>${alfresco.restapi.version}</version>
</dependency> </dependency>
<!-- Optional; use for Event API access --> <!-- Optional; use for Event API access -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-java-event-api-spring-boot-starter</artifactId> <artifactId>alfresco-java-event-api-spring-boot-starter</artifactId>
<version>${alfresco.sdk.version}</version> <version>${alfresco.restapi.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>