<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.api</artifactId>
[entity:term]
orderable
-- name (NAME) m
+- name (NAME)
- * (*)
+ term (entity:term) = entity:term *
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.core</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.api</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.core</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
for (String terms : typologies) {
loadTerms(termsBase, terms);
}
+ // TODO do not save here, so that upper layers can decide when to save
termsBase.getSession().save();
}
}
}
if (log.isDebugEnabled())
log.debug("Terms '" + name + "' loaded.");
+ // TODO do not save here, so that upper layers can decide when to save
termsBase.getSession().save();
} catch (RepositoryException | IOException e) {
log.error("Cannot load terms '" + name + "': " + e.getMessage());
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.theme.default</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.ui.rap</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
dashboard=dashboard
-people=contacts
+#people=contacts
documents=documents
locations=locations
recentItems=recent items
<properties entry="config/leadPane.properties"/>
<property name="defaultLayers" type="String">argeo.suite.ui.dashboardLayer
argeo.documents.ui.documentsLayer
+argeo.people.ui.peopleLayer
+argeo.geo.ui.mapLayer
</property>
<reference bind="addLayer" cardinality="1..n" interface="org.argeo.suite.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
</scr:component>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
appLayersC.setLayout(layout);
appLayersC.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
- Composite adminLayersC = new Composite(parent, SWT.NONE);
- CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
- GridLayout adminLayout = new GridLayout();
- adminLayout.verticalSpacing = 10;
- adminLayout.marginBottom = 10;
- adminLayout.marginLeft = 10;
- adminLayout.marginRight = 10;
- adminLayersC.setLayout(adminLayout);
- adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+ Composite adminLayersC;
+ if (!adminLayers.isEmpty()) {
+ adminLayersC = new Composite(parent, SWT.NONE);
+ CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+ GridLayout adminLayout = new GridLayout();
+ adminLayout.verticalSpacing = 10;
+ adminLayout.marginBottom = 10;
+ adminLayout.marginLeft = 10;
+ adminLayout.marginRight = 10;
+ adminLayersC.setLayout(adminLayout);
+ adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+ } else {
+ adminLayersC = null;
+ }
// boolean isAdmin = cmsView.doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN));
Set<String> userRoles = cmsView.doAs(() -> CurrentUser.roles());
private Composite dynamicArea;
private Session sysSession;
-// private Session homeSession;
+ private Session homeSession;
private Node userDir;
private Map<String, SuiteLayer> layers = new HashMap<>();
//
synchronized void initSessions(Repository repository, String userDirPath) throws RepositoryException {
this.sysSession = repository.login();
-// this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
+ this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
userDir = sysSession.getNode(userDirPath);
addDisposeListener((e) -> {
Jcr.logout(sysSession);
-// Jcr.logout(homeSession);
+ Jcr.logout(homeSession);
});
}
return sysSession;
if (NodeConstants.SYS_WORKSPACE.equals(workspaceName))
return sysSession;
-// else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName))
-// return homeSession;
+ else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName))
+ return homeSession;
else
throw new IllegalArgumentException("Unknown workspace " + workspaceName);
}
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>core</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dep</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dep</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.api</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Suite Icons -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.theme.default</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui.rap</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo People -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.people.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Library -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.documents.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Environment -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.geo.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Publishing -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.publishing.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Knowledge -->
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.xforms</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.odk</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.geonames</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Additional Third Parties -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dep</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dist</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>argeo-office</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.commons</groupId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dist</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>argeo-suite-demo</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dist</artifactId>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
--- /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>
org.eclipse.jface.viewers,\
org.osgi.framework,\
*
+
+Service-Component:\
+OSGI-INF/mapLayer.xml,\
+OSGI-INF/overviewMap.xml
--- /dev/null
+service.pid=argeo.geo.ui.mapLayer
+
+title=%map
+icon=map
+
+entity.type=entity:geopoint
--- /dev/null
+service.pid=argeo.geo.ui.overviewMap
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>environment</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.geo.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
--- /dev/null
+package org.argeo.support.openlayers;
+
+import java.util.List;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.jcr.query.Query;
+
+import org.argeo.cms.ui.CmsUiProvider;
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.entity.EntityType;
+import org.argeo.jcr.JcrException;
+import org.argeo.jcr.JcrUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/** Displays an overview map. */
+public class OverviewMap implements CmsUiProvider {
+
+ @Override
+ public Control createUi(Composite parent, Node context) throws RepositoryException {
+ parent.setLayout(new GridLayout());
+ refreshUi(parent, context);
+
+ try {
+ String[] nodeTypes = { EntityType.geopoint.get() };
+ context.getSession().getWorkspace().getObservationManager().addEventListener(new EventListener() {
+
+ @Override
+ public void onEvent(EventIterator events) {
+ if (!parent.isDisposed())
+ parent.getDisplay().asyncExec(() -> {
+ try {
+ refreshUi(parent, context);
+ } catch (RepositoryException e) {
+ throw new JcrException(e);
+ }
+ });
+ }
+ }, Event.PROPERTY_CHANGED | Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED, "/", true, null,
+ nodeTypes, false);
+ } catch (RepositoryException e) {
+ throw new IllegalStateException("Cannot add JCR observer", e);
+ }
+
+ return parent;
+ }
+
+ protected void refreshUi(Composite parent, Node context) throws RepositoryException {
+ CmsUiUtils.clear(parent);
+ Query query = context.getSession().getWorkspace().getQueryManager()
+ .createQuery("SELECT * FROM [" + EntityType.geopoint.get() + "]", Query.JCR_SQL2);
+ List<Node> geoPoints = JcrUtils.nodeIteratorToList(query.execute().getNodes());
+ OpenLayersMap apafMap = new OpenLayersMap(parent, SWT.NONE, getClass().getResource("map-osm.html"));
+ apafMap.setLayoutData(CmsUiUtils.fillAll());
+
+ // apafMap.setZoom(7);
+ // apafMap.setCenter(-2.472, 8.010);
+ apafMap.addPoints(geoPoints);
+ }
+}
--- /dev/null
+<html lang="en">
+<head>
+<link rel="stylesheet"
+ href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/css/ol.css"
+ type="text/css">
+<style>
+</style>
+<script
+ src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/build/ol.js"></script>
+</head>
+<body>
+ <div id="map" class="map"></div>
+ <script type="text/javascript">
+ // default OSM
+ var source_OSM = new ol.source.OSM();
+
+ var map = new ol.Map({
+ target : 'map',
+ layers : [ new ol.layer.Tile({
+ source : source_OSM
+ }) ],
+ view : new ol.View({
+ center : ol.proj.fromLonLat([ 34, 34 ]),
+ zoom : 4
+ })
+ });
+ map.on('rendercomplete', e => {
+ console.log('Render completed.');
+ renderCompleted();
+ });
+ var select = new ol.interaction.Select();
+ map.addInteraction(select);
+ select.on('select',function (e) {
+ if(e.selected.length>0){
+ console.log('Feature selected: '+e.selected[0].get('path'));
+ onFeatureSelect(e.selected[0].get('path'));
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>environment</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>knowledge</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.support.geonames</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>knowledge</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.support.odk</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.xforms</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>knowledge</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.support.xforms</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.core</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>knowledge</artifactId>
<packaging>pom</packaging>
<name>Parent POM for Argeo Suite Extensions</name>
<description />
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<properties>
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-commons>[2.1.102,2.3.0-SNAPSHOT)</version.argeo-commons>
<version.argeo-suite-icons>[2.1.1,2.3.0-SNAPSHOT)</version.argeo-suite-icons>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
<git.rw />
</properties>
<dependencies>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>argeo-unstable</id>
+ <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<reporting>
<plugins>
</plugin>
</plugins>
</reporting>
-
- <scm>
- <tag>v2.x</tag>
- </scm>
</project>
--- /dev/null
+content=content
service.pid=argeo.documents.ui.documentsLayer
-title=Documents
-icon=documents
\ No newline at end of file
+title=%content
+icon=documents
+
+entity.type=nt:folder
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>library</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.documents.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
package org.argeo.documents.ui;
+import java.nio.file.Path;
import java.nio.file.spi.FileSystemProvider;
import javax.jcr.Node;
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.jcr.Jcr;
+import org.argeo.suite.ui.SuiteEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@Override
public Control createUi(Composite parent, Node context) throws RepositoryException {
CmsView cmsView = CmsView.getCmsView(parent);
- DocumentsFolderComposite dfc = new DocumentsFolderComposite(parent, SWT.NONE, context);
+ DocumentsFolderComposite dfc = new DocumentsFolderComposite(parent, SWT.NONE, context) {
+
+ @Override
+ protected void externalNavigateTo(Path path) {
+ Node folderNode = cmsView.doAs(() -> CmsFsUtils.getNode(Jcr.getSession(context).getRepository(), path));
+ parent.addDisposeListener((e1) -> Jcr.logout(folderNode));
+ cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(folderNode));
+ }
+ };
dfc.setLayoutData(CmsUiUtils.fillAll());
dfc.populate(cmsView.doAs(() -> CmsFsUtils.getPath(nodeFileSystemProvider, context)));
return dfc;
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>library</artifactId>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
--- /dev/null
+people=people
--- /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">
+cn=APAF Internationale,ou=Groups,dc=apaf,dc=on,dc=djapps,dc=org
+cn=APAF Côte d'Ivoire Admin,ou=Groups,dc=apaf,dc=on,dc=djapps,dc=org
+cn=APAF Côte d'Ivoire,ou=Groups,dc=apaf,dc=on,dc=djapps,dc=org
+cn=APAF Togo Admin,ou=Groups,dc=apaf,dc=on,dc=djapps,dc=org
+cn=APAF Togo,ou=Groups,dc=apaf,dc=on,dc=djapps,dc=org
+ </property>
+ <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
+</scr:component>
org.eclipse.jface.window,\
org.osgi.framework,\
*
+
+Service-Component:\
+OSGI-INF/peopleLayer.xml,\
+OSGI-INF/personUiProvider.xml,\
+OSGI-INF/peopleEntryArea.xml
+
--- /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
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>people</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.people.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
--- /dev/null
+package org.argeo.people.ui;
+
+import java.util.Set;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.ui.CmsTheme;
+import org.argeo.cms.ui.CmsUiProvider;
+import org.argeo.cms.ui.CmsView;
+import org.argeo.cms.ui.dialogs.CmsWizardDialog;
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.eclipse.ui.Selected;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.suite.SuiteRole;
+import org.argeo.suite.ui.SuiteEvent;
+import org.argeo.suite.ui.SuiteIcon;
+import org.argeo.suite.ui.dialogs.NewUserWizard;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.osgi.service.useradmin.User;
+
+/** Entry to the admin area. */
+public class PeopleEntryArea implements CmsUiProvider {
+
+ private CmsUserManager cmsUserManager;
+
+ @Override
+ public Control createUi(Composite parent, Node context) throws RepositoryException {
+ CmsTheme theme = CmsTheme.getCmsTheme(parent);
+ parent.setLayout(new GridLayout());
+ TableViewer usersViewer = new TableViewer(parent);
+ usersViewer.setContentProvider(new UsersContentProvider());
+
+ TableViewerColumn idCol = new TableViewerColumn(usersViewer, SWT.NONE);
+ idCol.getColumn().setWidth(70);
+ idCol.setLabelProvider(new ColumnLabelProvider() {
+
+ @Override
+ public String getText(Object element) {
+
+ return getUserProperty(element, LdapAttrs.uid.name());
+ }
+ });
+
+ TableViewerColumn givenNameCol = new TableViewerColumn(usersViewer, SWT.NONE);
+ givenNameCol.getColumn().setWidth(150);
+ givenNameCol.setLabelProvider(new ColumnLabelProvider() {
+
+ @Override
+ public String getText(Object element) {
+
+ return getUserProperty(element, LdapAttrs.givenName.name());
+ }
+ });
+
+ TableViewerColumn snCol = new TableViewerColumn(usersViewer, SWT.NONE);
+ snCol.getColumn().setWidth(150);
+ snCol.setLabelProvider(new ColumnLabelProvider() {
+
+ @Override
+ public String getText(Object element) {
+
+ return getUserProperty(element, LdapAttrs.sn.name());
+ }
+ });
+
+ TableViewerColumn mailCol = new TableViewerColumn(usersViewer, SWT.NONE);
+ mailCol.getColumn().setWidth(400);
+ mailCol.setLabelProvider(new ColumnLabelProvider() {
+
+ @Override
+ public String getText(Object element) {
+
+ return getUserProperty(element, LdapAttrs.mail.name());
+ }
+ });
+
+ Composite bottom = new Composite(parent, SWT.NONE);
+ bottom.setLayoutData(CmsUiUtils.fillWidth());
+ bottom.setLayout(CmsUiUtils.noSpaceGridLayout());
+ ToolBar bottomToolBar = new ToolBar(bottom, SWT.NONE);
+ bottomToolBar.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
+ ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT);
+ deleteItem.setEnabled(false);
+// CmsUiUtils.style(deleteItem, SuiteStyle.recentItems);
+ deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme));
+ ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT);
+ addItem.setImage(SuiteIcon.add.getSmallIcon(theme));
+ usersViewer.addDoubleClickListener(new IDoubleClickListener() {
+
+ @Override
+ public void doubleClick(DoubleClickEvent event) {
+ User user = (User) usersViewer.getStructuredSelection().getFirstElement();
+ if (user != null) {
+// Node userNode = getOrCreateUserNode(user, context);
+ CmsView.getCmsView(parent).sendEvent(SuiteEvent.openNewPart.topic(),
+ SuiteEvent.eventProperties(user));
+ }
+
+ }
+ });
+ usersViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ User user = (User) usersViewer.getStructuredSelection().getFirstElement();
+ if (user != null) {
+// Node userNode = getOrCreateUserNode(user, context);
+ CmsView.getCmsView(parent).sendEvent(SuiteEvent.refreshPart.topic(),
+ SuiteEvent.eventProperties(user));
+ deleteItem.setEnabled(true);
+ } else {
+ deleteItem.setEnabled(false);
+ }
+ }
+ });
+
+ addItem.addSelectionListener((Selected) (e) -> {
+ // SuiteUtils.getOrCreateUserNode(adminSession, userDn);
+ Wizard wizard = new NewUserWizard(null);
+ CmsWizardDialog dialog = new CmsWizardDialog(parent.getShell(), wizard);
+ // WizardDialog dialog = new WizardDialog(shell, wizard);
+ if (dialog.open() == Window.OK) {
+ // TODO create
+ }
+ });
+
+ usersViewer.getTable().setLayoutData(CmsUiUtils.fillAll());
+ usersViewer.setInput(cmsUserManager);
+
+ return usersViewer.getTable();
+ }
+
+// private Node getOrCreateUserNode(User user, Node context) {
+// return JcrUtils.mkdirs(Jcr.getSession(context),
+// "/" + EntityType.user.name() + "/" + getUserProperty(user, LdapAttrs.uid.name()),
+// EntityType.user.get());
+// }
+
+ private String getUserProperty(Object element, String key) {
+ Object value = ((User) element).getProperties().get(key);
+ return value != null ? value.toString() : null;
+ }
+
+ class UsersContentProvider implements IStructuredContentProvider {
+
+ @Override
+ public Object[] getElements(Object inputElement) {
+ CmsUserManager cum = (CmsUserManager) inputElement;
+ Set<User> users = cum.listUsersInGroup(SuiteRole.coworker.dn(), null);
+ return users.toArray();
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+
+ }
+
+ public void setCmsUserManager(CmsUserManager cmsUserManager) {
+ this.cmsUserManager = cmsUserManager;
+ }
+
+}
--- /dev/null
+package org.argeo.people.ui;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.ui.CmsUiProvider;
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.ui.viewers.Section;
+import org.argeo.naming.LdapAttrs;
+import org.argeo.suite.ui.SuiteMsg;
+import org.argeo.suite.ui.SuiteUiUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.service.useradmin.User;
+
+/** Edit a suite user. */
+public class PersonUiProvider implements CmsUiProvider {
+ private String[] availableRoles;
+ private CmsUserManager cmsUserManager;
+
+ @Override
+ public Control createUi(Composite parent, Node context) throws RepositoryException {
+ Section main = new Section(parent, SWT.NONE, context);
+ main.setLayoutData(CmsUiUtils.fillAll());
+
+ String uid = context.getName();
+ User user = cmsUserManager.getUserFromLocalId(uid);
+
+// Text givenName = new Text(main, SWT.SINGLE);
+// givenName.setText(getUserProperty(user, LdapAttrs.givenName.name()));
+ Text givenName = SuiteUiUtils.addFormInput(main, SuiteMsg.firstName.lead(),
+ getUserProperty(user, LdapAttrs.givenName.name()));
+
+ Text sn = SuiteUiUtils.addFormInput(main, SuiteMsg.lastName.lead(), getUserProperty(user, LdapAttrs.sn.name()));
+ // sn.setText(getUserProperty(user, LdapAttrs.sn.name()));
+
+ Text email = SuiteUiUtils.addFormInput(main, SuiteMsg.email.lead(),
+ getUserProperty(user, LdapAttrs.mail.name()));
+ // email.setText(getUserProperty(user, LdapAttrs.mail.name()));
+
+ Text uidT = SuiteUiUtils.addFormLine(main, "uid", getUserProperty(user, LdapAttrs.uid.name()));
+ uidT.setText(uid);
+
+// Label dnL = new Label(main, SWT.NONE);
+// dnL.setText(user.getName());
+
+ // roles
+ // Section rolesSection = new Section(main, SWT.NONE, context);
+ Group rolesSection = new Group(main, SWT.NONE);
+ rolesSection.setText("Roles");
+ rolesSection.setLayoutData(CmsUiUtils.fillWidth());
+ rolesSection.setLayout(new GridLayout());
+ // new Label(rolesSection, SWT.NONE).setText("Roles:");
+ List<String> roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName()));
+ for (String role : availableRoles) {
+ // new Label(rolesSection, SWT.NONE).setText(role);
+ Button radio = new Button(rolesSection, SWT.CHECK);
+ radio.setText(role);
+ if (roles.contains(role))
+ radio.setSelection(true);
+ }
+
+ return main;
+ }
+
+ public void setCmsUserManager(CmsUserManager cmsUserManager) {
+ this.cmsUserManager = cmsUserManager;
+ }
+
+ private String getUserProperty(Object element, String key) {
+ Object value = ((User) element).getProperties().get(key);
+ return value != null ? value.toString() : null;
+ }
+
+ public void init(Map<String, Object> properties) {
+ availableRoles = (String[]) properties.get("availableRoles");
+ }
+}
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>people</artifactId>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.maven</groupId>
</parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>Argeo Suite</name>
<packaging>pom</packaging>
<url>http://www.argeo.org/</url>
<version.argeo-commons>[2.1.102,2.3.0-SNAPSHOT)</version.argeo-commons>
<version.argeo-suite-icons>[2.1.1,2.3.0-SNAPSHOT)</version.argeo-suite-icons>
- <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+ <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
<git.rw />
</properties>
<modules>
<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
<url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
<developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
- <tag>v2.x</tag>
+ <tag>HEAD</tag>
</scm>
<organization>
<name>Argeo GmbH</name>
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>argeo-unstable</id>
+ <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<reporting>
<plugins>
<distributionManagement>
<repository>
<id>staging</id>
- <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+ <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
<uniqueVersion>false</uniqueVersion>
</repository>
<site>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>publishing</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.publishing.ui</artifactId>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
import static org.argeo.docbook.DbkType.para;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
+import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
}
}
+ public static void importXml(Node baseNode, InputStream in) throws IOException {
+ try {
+ baseNode.getSession().importXML(baseNode.getPath(), in,
+ ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING);
+ } catch (RepositoryException e) {
+ throw new JcrException("Cannot import XML to " + baseNode, e);
+ }
+
+ }
+
/** Singleton. */
private DbkUtils() {
}
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.23-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>publishing</artifactId>
org.argeo.suite.ui.rap
argeo.osgi.start.6.suite=\
-org.argeo.documents.ui
+org.argeo.documents.ui,\
+org.argeo.people.ui,\
+org.argeo.geo.ui
+
# Local
argeo.node.repo.type=h2
projects / gpl / argeo-suite.git / commitdiff