projects / gpl / argeo-suite.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d95290b)
Fix ODK servlets runtime dependencies
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 23 Oct 2022 05:34:54 +0000 (07:34 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 23 Oct 2022 05:34:54 +0000 (07:34 +0200)
org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml patch | blob | history
org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml patch | blob | history
org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml patch | blob | history
org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml patch | blob | history

diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
index 18f346595761f1d456b28d62c94598c93c890454..3430eda7e16bbf7d7053dc49d1691d242ae1ce19 100644 (file)
--- 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)"/>
    </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>
 </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 816524a0f9a9ab0fdaebd78005e760b55d39c24b..82ed7121f12569fc4b2cd2c7e5d97c7965c84e67 100644 (file)
--- 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)"/>
    </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>
 </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 503a148cc74361f1488cd02da530d714a8210cc6..6cac13ea78ae346ab3ec8d379db79e7eec16adb9 100644 (file)
--- 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)"/>
    </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>
 </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 b9380d5950c62e498c7222d6909d7570c99cf8e1..40ed568e81c8a4818fd2a4ed1abdedf69dacc643 100644 (file)
--- 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"/>
    <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>
    <reference bind="addSubmissionListener" cardinality="0..n" interface="org.argeo.app.xforms.FormSubmissionListener" name="FormSubmissionListener" policy="dynamic" unbind="removeSubmissionListener"/>
 </scr:component>
Argeo Suite - Productivity Applications