<!-- Argeo Suite Icons -->
<dependency>
<groupId>org.argeo.suite.icons</groupId>
- <artifactId>org.argeo.suite.icons.default</artifactId>
+ <artifactId>org.argeo.app.icons.default</artifactId>
<version>${version.argeo-suite-icons}</version>
</dependency>
cms.datamodel;filter:="(name=jcrx)"
Provide-Capability:\
-cms.datamodel; name=entity; cnd=/org/argeo/entity/entity.cnd
+cms.datamodel; name=entity; cnd=/org/argeo/app/api/entity.cnd
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DocBook 4 Converter">
+ <implementation class="org.argeo.app.docbook.Dbk4Converter"/>
+ <service>
+ <provide interface="org.argeo.app.docbook.Dbk4Converter"/>
+ </service>
+</scr:component>
Service-Component:\
OSGI-INF/termsManager.xml,\
-OSGI-INF/maintenanceService.xml
+OSGI-INF/maintenanceService.xml,\
+OSGI-INF/dbk4Converter.xml,\
Import-Package:\
javax.transaction,\
javax.jcr.nodetype,\
javax.jcr.security,\
com.fasterxml.jackson.core,\
-*
\ No newline at end of file
+*
+
+Require-Capability:\
+cms.datamodel;filter:="(name=entity)"
+
+Provide-Capability:\
+cms.datamodel; name=xforms; cnd=/org/argeo/app/xforms/xforms.cnd; abstract=true,\
+cms.datamodel; name=odk; cnd=/org/argeo/app/odk/odk.cnd; abstract=true,\
+cms.datamodel; name=docbook; cnd=/org/argeo/app/docbook/docbook.cnd; abstract=true,\
Require-Capability:\
cms.datamodel;filter:="(name=entity)",\
-cms.datamodel;filter:="(name=xforms)"
-
-Provide-Capability:\
-cms.datamodel; name=odk; cnd=/org/argeo/support/odk/odk.cnd
+cms.datamodel;filter:="(name=xforms)",\
+cms.datamodel;filter:="(name=odk)",\
Service-Component:\
OSGI-INF/odkServletContext.xml,\
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DocBook 4 Converter">
- <implementation class="org.argeo.app.docbook.Dbk4Converter"/>
- <service>
- <provide interface="org.argeo.app.docbook.Dbk4Converter"/>
- </service>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.app.ui.publish.DocumentUiProvider"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/documentUiProvider.properties"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy">
- <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
- <properties entry="config/wwwLayer.properties"/>
- <service>
- <provide interface="org.argeo.app.ui.SuiteLayer"/>
- </service>
- <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.publishing.ui.documentUiProvider)"/>
-</scr:component>
org.argeo.app.api,\
*
-Provide-Capability:\
-cms.datamodel; name=docbook; cnd=/org/argeo/docbook/docbook.cnd; abstract=true
+Require-Capability:\
+cms.datamodel;filter:="(name=entity)",\
+cms.datamodel;filter:="(name=docbook)",\
Service-Component:\
OSGI-INF/fontsServlet.xml,\
OSGI-INF/htmlServletContext.xml,\
OSGI-INF/dbkServlet.xml,\
-OSGI-INF/documentUiProvider.xml,\
-OSGI-INF/wwwLayer.xml,\
-OSGI-INF/dbk4Converter.xml
+++ /dev/null
-service.pid=argeo.publishing.ui.documentUiProvider
-
-entity.type=entity:document,nt:file
\ No newline at end of file
+++ /dev/null
-service.pid=argeo.publishing.ui.wwwLayer
-
-title=Web
-icon=map
\ No newline at end of file
// TODO improve configuration and provisioning of DocBook XSL
String xslBase = System.getProperty("argeo.docbook.xsl");
if (xslBase == null) {
- String defaultXslBase = "/opt/docbook-xsl";
+ // We need namespace aware XSL!
+ // Fedora (sudo dnf install docbook5-style-xsl)
+ String defaultXslBase = "/usr/share/sgml/docbook/xsl-ns-stylesheets";
if (!Files.exists(Paths.get(defaultXslBase))) {
- throw new ServletException("System property argeo.docbook.xsl is not set and default location "
- + defaultXslBase + " does not exist.");
- } else {
- xslBase = defaultXslBase;
+ defaultXslBase = "/opt/docbook-xsl";
+ if (!Files.exists(Paths.get(defaultXslBase))) {
+ throw new ServletException("System property argeo.docbook.xsl is not set and default location "
+ + defaultXslBase + " does not exist.");
+ }
}
+ xslBase = defaultXslBase;
+
}
String xsl = xslBase + "/html/docbook.xsl";
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+ <implementation class="org.argeo.app.ui.library.ContentEntryArea"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/contentEntryArea.properties"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Content Layer">
+ <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
+ <service>
+ <provide interface="org.argeo.app.ui.SuiteLayer"/>
+ </service>
+ <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.library.ui.contentEntryArea)"/>
+ <properties entry="config/contentLayer.properties"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+ <implementation class="org.argeo.app.ui.publish.DocumentUiProvider"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/documentUiProvider.properties"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Documents Folder">
+ <implementation class="org.argeo.app.ui.library.DocumentsFolderUiProvider"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/documentsFolder.properties"/>
+ <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+ <implementation class="org.argeo.app.ui.library.DocumentsTreeUiProvider"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/contentEntryArea.properties"/>
+ <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
+ <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
+</scr:component>
# Tags
confirmNewTag=Tag #{0} is not yet registered. Are you sure you want to create it?
cannotCreateTag=Tag #{0} is not yet registered and you don't have enough rights to create it.
+
+# People
+people=people
+
+# Library
+content=content
+
+# Geo
+map=map
+
--- /dev/null
+<?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="Map Layer">
+ <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
+ <properties entry="config/mapLayer.properties"/>
+ <service>
+ <provide interface="org.argeo.app.ui.SuiteLayer"/>
+ </service>
+ <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.geo.ui.overviewMap)"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+ <implementation class="org.argeo.app.ui.openlayers.OverviewMap"/>
+ <properties entry="config/overviewMap.properties"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
+ <implementation class="org.argeo.app.ui.people.PeopleEntryArea"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/peopleEntryArea.properties"/>
+ <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
+</scr:component>
--- /dev/null
+<?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="People Layer">
+ <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
+ <properties entry="config/peopleLayer.properties"/>
+ <service>
+ <provide interface="org.argeo.app.ui.SuiteLayer"/>
+ </service>
+ <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.people.ui.peopleEntryArea)"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init">
+ <implementation class="org.argeo.app.ui.people.PersonUiProvider"/>
+ <service>
+ <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+ </service>
+ <properties entry="config/personUiProvider.properties"/>
+ <property name="availableRoles" type="String">
+ </property>
+ <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
+</scr:component>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy">
+ <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
+ <properties entry="config/wwwLayer.properties"/>
+ <service>
+ <provide interface="org.argeo.app.ui.SuiteLayer"/>
+ </service>
+ <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.publishing.ui.documentUiProvider)"/>
+</scr:component>
OSGI-INF/termsEntryArea.xml,\
OSGI-INF/termsLayer.xml,\
OSGI-INF/dashboard.xml,\
-OSGI-INF/dashboardLayer.xml
+OSGI-INF/dashboardLayer.xml,\
+OSGI-INF/peopleEntryArea.xml,\
+OSGI-INF/peopleLayer.xml,\
+OSGI-INF/personUiProvider.xml,\
+OSGI-INF/contentEntryArea.xml,\
+OSGI-INF/contentLayer.xml,\
+OSGI-INF/documentsFolder.xml,\
+OSGI-INF/fsEntryArea.xml,\
+OSGI-INF/mapLayer.xml,\
+OSGI-INF/overviewMap.xml,\
+OSGI-INF/wwwLayer.xml,\
+OSGI-INF/documentUiProvider.xml,\
+
+
Import-Package:\
org.argeo.cms.ui.widgets,\
--- /dev/null
+service.pid=argeo.library.ui.contentEntryArea
--- /dev/null
+service.pid=argeo.library.ui.contentLayer
+
+title=%content
+icon=documents
+
+entity.type=nt:folder,nt:file,entity:space,entity:document
--- /dev/null
+service.pid=argeo.publishing.ui.documentUiProvider
+
+entity.type=entity:document,nt:file
\ No newline at end of file
--- /dev/null
+entity.type=nt:folder
\ No newline at end of file
--- /dev/null
+service.pid=argeo.library.ui.fsEntryArea
--- /dev/null
+service.pid=argeo.geo.ui.mapLayer
+
+title=%map
+icon=map
+
+entity.type=entity:geopoint
--- /dev/null
+service.pid=argeo.geo.ui.overviewMap
--- /dev/null
+service.pid=argeo.people.ui.peopleEntryArea
--- /dev/null
+service.pid=argeo.people.ui.peopleLayer
+
+icon=people
+weights=5000,5000
+title=%people
+
+entity.type=entity:person
\ No newline at end of file
--- /dev/null
+service.pid=argeo.people.ui.personUiProvider
+
+entity.type=entity:person
\ No newline at end of file
--- /dev/null
+service.pid=argeo.publishing.ui.wwwLayer
+
+title=Web
+icon=map
\ No newline at end of file
private String adminLeadPanePid;
private String loginScreenPid;
- private String defaultLayerPid = "argeo.suite.ui.dashboardLayer";
+ private String defaultLayerPid = "argeo.app.ui.dashboardLayer";
private String defaultUiName = "app";
private String adminUiName = "admin";
- private String defaultThemeId = "org.argeo.suite.theme.default";
+ private String defaultThemeId = "org.argeo.app.theme.default";
private Map<String, RankedObject<CmsUiProvider>> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>());
private Map<String, RankedObject<CmsUiProvider>> uiProvidersByType = Collections.synchronizedMap(new HashMap<>());
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy">
- <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
- <properties entry="config/mapLayer.properties"/>
- <service>
- <provide interface="org.argeo.suite.ui.SuiteLayer"/>
- </service>
- <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.geo.ui.overviewMap)"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.support.openlayers.OverviewMap"/>
- <properties entry="config/overviewMap.properties"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
-</scr:component>
+++ /dev/null
-service.pid=argeo.geo.ui.mapLayer
-
-title=%map
-icon=map
-
-entity.type=entity:geopoint
+++ /dev/null
-service.pid=argeo.geo.ui.overviewMap
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.library.ui.ContentEntryArea"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/contentEntryArea.properties"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
- <service>
- <provide interface="org.argeo.suite.ui.SuiteLayer"/>
- </service>
- <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.library.ui.contentEntryArea)"/>
- <properties entry="config/contentLayer.properties"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Documents Folder">
- <implementation class="org.argeo.library.ui.DocumentsFolderUiProvider"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/documentsFolder.properties"/>
- <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.library.ui.DocumentsTreeUiProvider"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/contentEntryArea.properties"/>
- <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
- <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
-</scr:component>
+++ /dev/null
-service.pid=argeo.library.ui.contentEntryArea
+++ /dev/null
-service.pid=argeo.library.ui.contentLayer
-
-title=%content
-icon=documents
-
-entity.type=nt:folder,nt:file,entity:space,entity:document
+++ /dev/null
-entity.type=nt:folder
\ No newline at end of file
+++ /dev/null
-service.pid=argeo.library.ui.fsEntryArea
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.argeo.people.ui.PeopleEntryArea"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/peopleEntryArea.properties"/>
- <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy">
- <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
- <properties entry="config/peopleLayer.properties"/>
- <service>
- <provide interface="org.argeo.suite.ui.SuiteLayer"/>
- </service>
- <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.people.ui.peopleEntryArea)"/>
-</scr:component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init">
- <implementation class="org.argeo.people.ui.PersonUiProvider"/>
- <service>
- <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
- </service>
- <properties entry="config/personUiProvider.properties"/>
- <property name="availableRoles" type="String">
- </property>
- <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
-</scr:component>
+++ /dev/null
-service.pid=argeo.people.ui.peopleEntryArea
+++ /dev/null
-service.pid=argeo.people.ui.peopleLayer
-
-icon=people
-weights=5000,5000
-title=%people
-
-entity.type=entity:person
\ No newline at end of file
+++ /dev/null
-service.pid=argeo.people.ui.personUiProvider
-
-entity.type=entity:person
\ No newline at end of file
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
- <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
+ <version.argeo-suite-icons>2.3-SNAPSHOT</version.argeo-suite-icons>
<git.rw />
</properties>
<modules>