This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a commit to branch reduceIndicesItems3
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/reduceIndicesItems3 by this
push:
new f27e674c5 UNOMI-736: More fixes regarding groovy actions
f27e674c5 is described below
commit f27e674c5432b1db601e642ee1947cf8f0e9ecc6
Author: Kevan <ke...@jahia.com>
AuthorDate: Tue Feb 28 10:57:58 2023 +0100
UNOMI-736: More fixes regarding groovy actions
---
.../groovy-actions/karaf-kar/src/main/feature/feature.xml | 8 ++++----
.../unomi/groovy/actions/listener/GroovyActionListener.java | 8 --------
.../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 1 -
kar/pom.xml | 10 ----------
4 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
index a4af565e2..649b74097 100644
--- a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
@@ -18,15 +18,15 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0";
name="unomi-groovy-actions">
<feature name="unomi-groovy-actions" description="${project.name}"
version="${project.version}">
<details>${project.description}</details>
- <feature prerequisite="true" dependency="false">wrap</feature>
- <feature dependency="true">unomi-kar</feature>
+ <feature>wrap</feature>
+ <feature>unomi-kar</feature>
<bundle
start-level="85">mvn:org.codehaus.groovy/groovy/${groovy.version}</bundle>
<bundle
start-level="85">mvn:org.codehaus.groovy/groovy-xml/${groovy.version}</bundle>
<bundle
start-level="85">mvn:org.codehaus.groovy/groovy-json/${groovy.version}</bundle>
- <bundle start-level="85"
start="false">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}</bundle>
- <bundle start-level="85"
start="false">mvn:org.apache.unomi/unomi-groovy-actions-rest/${project.version}</bundle>
<bundle
start-level="85">wrap:mvn:io.github.http-builder-ng/http-builder-ng-core/1.0.4</bundle>
<bundle start-level="85">mvn:org.jsoup/jsoup/1.13.1</bundle>
<bundle
start-level="85">mvn:com.sun.activation/javax.activation/1.2.0</bundle>
+ <bundle start-level="85"
start="false">mvn:org.apache.unomi/unomi-groovy-actions-services/${project.version}</bundle>
+ <bundle start-level="85"
start="false">mvn:org.apache.unomi/unomi-groovy-actions-rest/${project.version}</bundle>
</feature>
</features>
diff --git
a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/listener/GroovyActionListener.java
b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/listener/GroovyActionListener.java
index 86baae6b1..bb27e1d3b 100644
---
a/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/listener/GroovyActionListener.java
+++
b/extensions/groovy-actions/services/src/main/java/org/apache/unomi/groovy/actions/listener/GroovyActionListener.java
@@ -16,12 +16,9 @@
*/
package org.apache.unomi.groovy.actions.listener;
-import groovy.util.GroovyScriptEngine;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.unomi.groovy.actions.GroovyAction;
import org.apache.unomi.groovy.actions.services.GroovyActionsService;
-import org.apache.unomi.persistence.spi.PersistenceService;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -43,15 +40,10 @@ public class GroovyActionListener implements
SynchronousBundleListener {
private static final Logger logger =
LoggerFactory.getLogger(GroovyActionListener.class.getName());
public static final String ENTRIES_LOCATION = "META-INF/cxs/actions";
- private PersistenceService persistenceService;
private GroovyActionsService groovyActionsService;
private BundleContext bundleContext;
- public void setPersistenceService(PersistenceService persistenceService) {
- this.persistenceService = persistenceService;
- }
-
public void setGroovyActionsService(GroovyActionsService
groovyActionsService) {
this.groovyActionsService = groovyActionsService;
}
diff --git
a/extensions/groovy-actions/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
b/extensions/groovy-actions/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 433cd549c..f84e50fc6 100644
---
a/extensions/groovy-actions/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++
b/extensions/groovy-actions/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -57,7 +57,6 @@
<bean id="groovyActionListenerImpl"
class="org.apache.unomi.groovy.actions.listener.GroovyActionListener"
init-method="postConstruct" destroy-method="preDestroy">
- <property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="groovyActionsService" ref="groovyActionsServiceImpl"/>
</bean>
diff --git a/kar/pom.xml b/kar/pom.xml
index 6e41b8097..3e72e3994 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -124,16 +124,6 @@
<artifactId>unomi-json-schema-rest</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-groovy-actions-services</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-groovy-actions-rest</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
