Adapt to changes in Argeo Commons

diff --git a/org.argeo.app.core/OSGI-INF/maintenanceService.xml b/org.argeo.app.core/OSGI-INF/maintenanceService.xml
index 7ebc97b69db17de76f5ddfc5c0a889999a98ec8a..0a4e849f10a9892e9e7d11935c81bfc2ea4573df 100644 (file)
--- a/org.argeo.app.core/OSGI-INF/maintenanceService.xml
+++ b/org.argeo.app.core/OSGI-INF/maintenanceService.xml
@@ -1,8 +1,8 @@
 <?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="Suite Maintenance Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true"  name="Suite Maintenance Service">
    <implementation class="org.argeo.app.core.SuiteMaintenanceService"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
-   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.osgi.transaction.WorkTransaction" name="WorkTransaction" policy="static"/>
+   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.util.transaction.WorkTransaction" name="WorkTransaction" policy="static"/>
    <reference bind="setUserAdmin" cardinality="1..1" interface="org.osgi.service.useradmin.UserAdmin" name="UserAdmin" policy="static"/>
-   <reference bind="setContentRepository" cardinality="1..1" interface="org.argeo.api.acr.spi.ProvidedRepository" name="ProvidedRepository" policy="static"/>
+   <reference bind="setContentRepository" cardinality="1..1" interface="org.argeo.api.acr.spi.ProvidedRepository" name="ContentRepository" policy="static"/>
 </scr:component>

diff --git a/org.argeo.app.core/OSGI-INF/termsManager.xml b/org.argeo.app.core/OSGI-INF/termsManager.xml
index 92f84c6a92e1512d6f0eadd9e4f9cbf894be15d7..8430b7aba9e90c3e30b64ab939e10e4f70f44d26 100644 (file)
--- a/org.argeo.app.core/OSGI-INF/termsManager.xml
+++ b/org.argeo.app.core/OSGI-INF/termsManager.xml
@@ -1,5 +1,5 @@
 <?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="Suite Terms Manager">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="Suite Terms Manager">
    <implementation class="org.argeo.app.core.SuiteTermsManager"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
    <service>

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
index 3c8b5d8f397c3f5c7ab581cd2e8f563c11fd6d86..f42cde65ce459aff4fd95cc3221ed64c7a5c48f4 100644 (file)
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
@@ -5,6 +5,14 @@ import java.net.URL;
 import java.util.Objects;
 
 public enum SuiteContentTypes {
+       //
+       // ARGEO
+       //
+       ENTITY("entity", "http://www.argeo.org/ns/entity", null, null),
+       //
+       ARGEO_DBK("argeodbk", "http://www.argeo.org/ns/argeodbk", null, null),
+       //
+       // EXTERNAL
        //
        XCARD_4_0("xcard", "urn:ietf:params:xml:ns:vcard-4.0", "xCard-4.0.xsd", null),
        //
@@ -12,6 +20,18 @@ public enum SuiteContentTypes {
                        "https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/fop/src/foschema/fop.xsd"),
        //
 //     XCAL_2_0("xcal", "urn:ietf:params:xml:ns:icalendar-2.0", "xCal-2.0.xsd", null),
+       //
+       // ODK
+       //
+       JR("jr", "http://openrosa.org/javarosa", null, null),
+       //
+       ORX("orx", "http://openrosa.org/xforms", null, null),
+       //
+       ORX_LIST("orxList", "http://openrosa.org/xforms/xformsList", null, null),
+       //
+       ORX_MANIFEST("orxManifest", "http://openrosa.org/xforms/xformsManifest", null, null),
+       //
+       ODK("odk", "http://www.opendatakit.org/xforms", null, null),
        //
        ;
 
@@ -27,8 +47,10 @@ public enum SuiteContentTypes {
                this.defaultPrefix = defaultPrefix;
                Objects.requireNonNull(namespace);
                this.namespace = namespace;
-               resource = getClass().getResource(RESOURCE_BASE + resourceFileName);
-               Objects.requireNonNull(resource);
+               if (resourceFileName != null) {
+                       resource = getClass().getResource(RESOURCE_BASE + resourceFileName);
+                       Objects.requireNonNull(resource);
+               }
                if (publicUrl != null)
                        try {
                                this.publicUrl = new URL(publicUrl);

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
index ce90a873b0f9ff20210bb613fefe983c810d3803..298f96bc3e2569a252be8a6bc83219b2eb8847cd 100644 (file)
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
@@ -24,7 +24,7 @@ public class SuiteMaintenanceService extends AbstractMaintenanceService {
 
                for (SuiteContentTypes types : SuiteContentTypes.values()) {
                        contentRepository.registerTypes(types.getDefaultPrefix(), types.getNamespace(),
-                                       types.getResource().toExternalForm());
+                                       types.getResource() != null ? types.getResource().toExternalForm() : null);
                }
        }