Commit 6b32abae authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents ae056428 189e4160

beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
	<name>${shortname} ACS All-in-one Parent Project</name>



	<properties>

		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>

		<alfresco.sdk.version>4.8.0</alfresco.sdk.version>

		<edition>community</edition>

		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>

		<alfresco.share.version>6.2.2.2</alfresco.share.version>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

		<alfresco.share.version>23.2.0.72</alfresco.share.version>

		

    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<maven.compiler.source>8</maven.compiler.source>

beedk-acs-platform-it-tile/tile.xml

+3 −3
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ 
				<acs-platform.port>8080</acs-platform.port>

				

				<!-- versions -->

				<acs-postgres.version>9.6</acs-postgres.version>

				<acs-activemq.version>5.15.8</acs-activemq.version>

				<tomcat-rad.version>9-1.4</tomcat-rad.version>

				<acs-postgres.version>12</acs-postgres.version>

				<acs-activemq.version>5.18.4</acs-activemq.version>

				<tomcat-rad.version>9-2.1</tomcat-rad.version>

			</properties>

		</profile>

	</profiles>

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
		<maven.compiler.source>8</maven.compiler.source>

		<maven.compiler.target>8</maven.compiler.target>



		<alfresco.sdk.version>4.2.0</alfresco.sdk.version>

		<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>

		<alfresco.sdk.version>4.8.0</alfresco.sdk.version>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

	</properties>



	<dependencyManagement>

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleActionExecuter.java

+4 −3
Original line number Diff line number Diff line
@@ -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.

 * 

 * The bean must be declared in the XML and not through annotations.

 */

public class ExampleActionExecuter extends ActionExecuterAbstractBase {
@@ -45,9 +47,8 @@ public class ExampleActionExecuter extends ActionExecuterAbstractBase { 
	}

    

    @Override

    protected void executeImpl(Action action, NodeRef actionedUponNoderef) {

    	if (this.logger.isTraceEnabled())

    		this.logger.trace("executeImpl('" + actionedUponNoderef + "')");

    protected void executeImpl(Action action, NodeRef actionedUponNodeRef) {

    	this.logger.trace("executeImpl({})", actionedUponNodeRef);

    	

    	String value = (String)action.getParameterValue("example.param");

    	// TODO do some work

beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/ExampleEventListener.java

+19 −2
Original line number Diff line number Diff line
@@ -14,11 +14,19 @@ 
 */

package ${package};



import java.io.Serializable;

import java.util.Map;



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.JavaBehaviour;

import org.alfresco.service.ServiceRegistry;

import org.alfresco.service.cmr.repository.ChildAssociationRef;

import org.alfresco.service.namespace.QName;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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.

 */

@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());
@@ -64,9 +73,17 @@ public class ExampleEventListener extends AbstractLifecycleBean implements OnCre 
	 */

	@Override

	public void onCreateNode(ChildAssociationRef childAssocRef) {

		this.logger.trace("onCreateNode('" + childAssocRef.getChildRef() + "')");

		this.logger.trace("onCreateNode({})", childAssocRef.getChildRef());

		

		// 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



	}



}