From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 23 Oct 2022 05:34:54 +0000 (+0200)
Subject: Fix ODK servlets runtime dependencies
X-Git-Tag: v2.3.8~6
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=593c7849c779cedf70ea6e6d4d665c98905f4f00

Fix ODK servlets runtime dependencies
---

diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
index 18f3465..3430eda 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
@@ -6,6 +6,5 @@
    </service>
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/formList/*"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
-   <reference bind="addForm" cardinality="0..n" interface="org.argeo.app.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
index 816524a..82ed712 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
@@ -6,6 +6,5 @@
    </service>
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/form/*"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
-   <reference bind="addForm" cardinality="0..n" interface="org.argeo.app.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
index 503a148..6cac13e 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
@@ -6,5 +6,5 @@
    </service>
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/formManifest/*"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
index b9380d5..40ed568 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
@@ -7,6 +7,6 @@
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/submission"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
    <property name="osgi.http.whiteboard.servlet.multipart.enabled" type="String" value="true"/>
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
    <reference bind="addSubmissionListener" cardinality="0..n" interface="org.argeo.app.xforms.FormSubmissionListener" name="FormSubmissionListener" policy="dynamic" unbind="removeSubmissionListener"/>
 </scr:component>