<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.argeo.entity.api</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Argeo Commons -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>core</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
- <version>2.1.22-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());
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<type>pom</type>
</dependency>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>dep</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.core</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.entity.ui</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.suite.ui</artifactId>
- <version>2.1.22-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.22-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.22-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.22-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.22-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.22-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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.odk</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.geonames</artifactId>
- <version>2.1.22-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.22-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.22-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.22-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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>dist</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>environment</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-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.22-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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.argeo.suite</groupId>
<artifactId>org.argeo.support.xforms</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>knowledge</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<properties>
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- <version.argeo-commons>2.1.102-SNAPSHOT</version.argeo-commons>
- <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+ <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
+ <version.argeo-suite-icons>2.1.0</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.22-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>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>library</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>library</artifactId>
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>people</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>Argeo Suite</name>
<packaging>pom</packaging>
<url>http://www.argeo.org/</url>
<!-- Dependencies -->
<version.argeo-tp>2.1.27</version.argeo-tp>
<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- <version.argeo-commons>2.1.102-SNAPSHOT</version.argeo-commons>
+ <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
<version.argeo-suite-icons>2.1.1</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.22-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.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
<!-- Eclipse E4 -->
<parent>
<groupId>org.argeo.suite</groupId>
<artifactId>argeo-suite</artifactId>
- <version>2.1.22-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>publishing</artifactId>