Fix ODK servlets

diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
index 89adf623f79bc9e4f5044b9e22c4d84827483912..18f346595761f1d456b28d62c94598c93c890454 100644 (file)
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Form List Servlet">
-   <implementation class="org.argeo.app.odk.servlet.OdkFormListServlet"/>
+   <implementation class="org.argeo.app.servlet.odk.OdkFormListServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </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=odk)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
 </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 ee3103150ec2a66d5c4829fae518caacb3c853f0..816524a0f9a9ab0fdaebd78005e760b55d39c24b 100644 (file)
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Form Servlet">
-   <implementation class="org.argeo.app.odk.servlet.OdkFormServlet"/>
+   <implementation class="org.argeo.app.servlet.odk.OdkFormServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </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=odk)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
 </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 00fd3dbdd77efd519073c17a3eb262253f30819e..503a148cc74361f1488cd02da530d714a8210cc6 100644 (file)
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Manifest Servlet">
-   <implementation class="org.argeo.app.odk.servlet.OdkManifestServlet"/>
+   <implementation class="org.argeo.app.servlet.odk.OdkManifestServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </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=odk)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
 </scr:component>

diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
index 78c6af2c69374c3d334e03e3e0be7e60f388e443..6cb17eab92389383384a8c02cb2178c1bae284f6 100644 (file)
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="ODK Servlet Context">
-   <implementation class="org.argeo.app.odk.servlet.OdkServletContext"/>
+   <implementation class="org.argeo.app.servlet.odk.OdkServletContext"/>
    <service>
       <provide interface="org.osgi.service.http.context.ServletContextHelper"/>
    </service>

diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
index bc7659217e931ba8ad34549ae49656ecff42c269..b9380d5950c62e498c7222d6909d7570c99cf8e1 100644 (file)
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Submission Servlet">
-   <implementation class="org.argeo.app.odk.servlet.OdkSubmissionServlet"/>
+   <implementation class="org.argeo.app.servlet.odk.OdkSubmissionServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
    <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=odk)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
    <reference bind="addSubmissionListener" cardinality="0..n" interface="org.argeo.app.xforms.FormSubmissionListener" name="FormSubmissionListener" policy="dynamic" unbind="removeSubmissionListener"/>
 </scr:component>