From 166340db957d4b72d7f6d0a077bdb639220333c3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 9 Jun 2021 09:38:05 +0200 Subject: [PATCH 1/1] Introduce Argeo Suite Standard deployment. --- .../src/org/argeo/suite/ui/SuiteApp.java | 2 +- dep/org.argeo.suite.dep.ui.rap/pom.xml | 6 +- .../assembly/argeo-office-e4-rap.xml | 47 ------------ .../base/etc/argeo/conf.d/argeo-office.ini | 8 --- dist/argeo-office/pom.xml | 72 ------------------- dist/argeo-suite-demo/.gitignore | 1 - .../rpm/etc/argeo.d/demo/jvm.args | 1 - .../system/argeo@demo.service.d/user.conf | 3 - .../rpm/var/lib/argeo.d/demo/state/config.ini | 16 ----- .../.gitignore | 0 .../pom.xml | 36 +++------- .../rpm/etc/argeo.d/suite/config.ini | 33 +++++++++ .../suite}/init/dc=example,dc=com.ldif | 0 .../argeo.d/suite}/init/ou=roles,ou=node.ldif | 0 .../rpm/etc/argeo.d/suite/jvm.args | 1 + .../rpm/etc/argeo.d/suite}/log4j.properties | 2 +- .../system/argeo@suite.service.d/user.conf | 3 + dist/pom.xml | 3 +- 18 files changed, 51 insertions(+), 183 deletions(-) delete mode 100644 dist/argeo-office/assembly/argeo-office-e4-rap.xml delete mode 100644 dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini delete mode 100644 dist/argeo-office/pom.xml delete mode 100644 dist/argeo-suite-demo/.gitignore delete mode 100644 dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args delete mode 100644 dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf delete mode 100644 dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini rename dist/{argeo-office => argeo-suite-standard}/.gitignore (100%) rename dist/{argeo-suite-demo => argeo-suite-standard}/pom.xml (56%) create mode 100644 dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini rename dist/{argeo-suite-demo/rpm/etc/argeo.d/demo => argeo-suite-standard/rpm/etc/argeo.d/suite}/init/dc=example,dc=com.ldif (100%) rename dist/{argeo-suite-demo/rpm/etc/argeo.d/demo => argeo-suite-standard/rpm/etc/argeo.d/suite}/init/ou=roles,ou=node.ldif (100%) create mode 100644 dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args rename dist/{argeo-suite-demo/rpm/etc/argeo.d/demo => argeo-suite-standard/rpm/etc/argeo.d/suite}/log4j.properties (90%) create mode 100644 dist/argeo-suite-standard/rpm/etc/systemd/system/argeo@suite.service.d/user.conf diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java index c0dbc57..32b6da8 100644 --- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -308,7 +308,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { for (NodeType nodeType : context.getMixinNodeTypes()) { sb.append(' '); sb.append(nodeType.getName()); - if (nodeType.getName().equals(EntityType.entity.get())) + if (nodeType.getName().equals(EntityType.local.get())) sb.append('/').append(context.getProperty(EntityNames.ENTITY_TYPE).getString()); for (NodeType superType : nodeType.getDeclaredSupertypes()) { sb.append(' '); diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index 9ba1c7f..66d2a8c 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -246,7 +246,7 @@ rpm - argeo-suite-ui-rap + argeo-suite-ui-rap-unstable /usr/share/osgi @@ -266,7 +266,7 @@ argeo-cms-ui-rap - argeo-suite-ui-rap-tp + argeo-suite-ui-rap-tp-unstable @@ -307,7 +307,7 @@ rpm - argeo-suite-ui-rap-tp + argeo-suite-ui-rap-tp-unstable ${version.argeo-tp} ${maven.build.timestamp} diff --git a/dist/argeo-office/assembly/argeo-office-e4-rap.xml b/dist/argeo-office/assembly/argeo-office-e4-rap.xml deleted file mode 100644 index 30733b4..0000000 --- a/dist/argeo-office/assembly/argeo-office-e4-rap.xml +++ /dev/null @@ -1,47 +0,0 @@ - - dist - argeo-office - - dir - zip - - - - base - - 0644 - - ** - - - offline.bat - - - - - - false - ${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension} - share/osgi - - - true - true - - - org.argeo.commons:osgi-boot:zip:*:* - - - - true - true - - - org.argeo.commons:argeo-node:zip:*:* - - - - \ No newline at end of file diff --git a/dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini b/dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini deleted file mode 100644 index 4a6facd..0000000 --- a/dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini +++ /dev/null @@ -1,8 +0,0 @@ -argeo.osgi.start.2.suite=\ -org.apache.tika.parsers - -argeo.osgi.start.3.suite=\ -org.argeo.suite.cms - -argeo.osgi.start.5.suite=\ -org.argeo.suite.e4.rap diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml deleted file mode 100644 index dc4c578..0000000 --- a/dist/argeo-office/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - org.argeo.suite - dist - 2.3.1-SNAPSHOT - .. - - argeo-office - pom - Argeo Office - - - - - - - - - - - - - - - dist - - - org.argeo.suite - org.argeo.suite.dep.e4.rap - 2.3.1-SNAPSHOT - - - org.argeo.commons - osgi-boot - zip - ${version.argeo-commons} - - - org.argeo.commons - argeo-node - zip - ${version.argeo-commons} - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - argeo-suite-${project.version} - false - - assembly/argeo-office-e4-rap.xml - - - - - assembly-base - package - - single - - - - - - - - - diff --git a/dist/argeo-suite-demo/.gitignore b/dist/argeo-suite-demo/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/dist/argeo-suite-demo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args deleted file mode 100644 index b16559b..0000000 --- a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args +++ /dev/null @@ -1 +0,0 @@ --Dlog4j.configuration=file:/etc/argeo.d/demo/log4j.properties diff --git a/dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf b/dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf deleted file mode 100644 index 0d23499..0000000 --- a/dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -User=demo -Group=demo \ No newline at end of file diff --git a/dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini b/dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini deleted file mode 100644 index 430e83e..0000000 --- a/dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini +++ /dev/null @@ -1,16 +0,0 @@ -org.osgi.service.http.port=8080 -#org.eclipse.equinox.http.jetty.http.host=[IP address to listen to] -#osgi.console=[IP address to listen to]:2323 -osgi.console=2323 -osgi.clean=true - -argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost/dc=example,dc=com -argeo.node.repo.type=postgresql_ds -argeo.node.repo.dburl=jdbc:postgresql://localhost/demo -argeo.node.repo.dbuser=argeo -argeo.node.repo.dbpassword=changeit - -argeo.osgi.start.5.suite=\ -org.argeo.suite.ui,\ -org.argeo.suite.theme.default,\ -org.argeo.suite.ui.rap diff --git a/dist/argeo-office/.gitignore b/dist/argeo-suite-standard/.gitignore similarity index 100% rename from dist/argeo-office/.gitignore rename to dist/argeo-suite-standard/.gitignore diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-standard/pom.xml similarity index 56% rename from dist/argeo-suite-demo/pom.xml rename to dist/argeo-suite-standard/pom.xml index c31fc7d..a091f2e 100644 --- a/dist/argeo-suite-demo/pom.xml +++ b/dist/argeo-suite-standard/pom.xml @@ -6,9 +6,9 @@ 2.3.1-SNAPSHOT .. - argeo-suite-demo + argeo-suite-standard pom - Argeo Suite Demo + Argeo Suite Standard rpmbuild @@ -25,51 +25,31 @@ rpm - argeo-suite-demo + argeo-suite-standard-unstable - /etc/argeo.d/demo + /etc/argeo.d/suite noreplace false - rpm/etc/argeo.d/demo + rpm/etc/argeo.d/suite - /etc/argeo.d/demo/init + /etc/systemd/system/argeo@suite.service.d noreplace false - rpm/etc/argeo.d/demo/init - - - - - /var/lib/argeo.d/demo/state - noreplace - false - - - rpm/var/lib/argeo.d/demo/state - - - - - /etc/systemd/system/argeo@demo.service.d - noreplace - false - - - rpm/etc/systemd/system/argeo@demo.service.d + rpm/etc/systemd/system/argeo@suite.service.d - argeo-suite-ui-rap + argeo-suite-ui-rap-unstable diff --git a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini new file mode 100644 index 0000000..8a693fe --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini @@ -0,0 +1,33 @@ +org.osgi.service.http.port=8080 +#org.eclipse.equinox.http.jetty.http.host=[IP address to listen to] +#osgi.console=[IP address to listen to]:2323 +osgi.console=2323 +osgi.clean=true + +argeo.node.useradmin.uris=dc=example,dc=com.ldif +argeo.node.repo.type=h2 + +argeo.osgi.start.2.node=\ +org.eclipse.equinox.http.servlet,\ +org.eclipse.equinox.metatype,\ +org.eclipse.equinox.cm,\ +org.eclipse.rap.rwt.osgi + +argeo.osgi.start.2.suite=\ +org.apache.tika.parsers + +argeo.osgi.start.3.node=\ +org.argeo.cms + +argeo.osgi.start.5.suite=\ +org.argeo.suite.core,\ +org.argeo.suite.ui,\ +org.argeo.suite.theme.default,\ +org.argeo.suite.ui.rap + +argeo.osgi.start.6.suite=\ +org.argeo.documents.ui,\ +org.argeo.people.ui,\ +org.argeo.geo.ui + +argeo.node.init=/etc/argeo.d/suite/init diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/dc=example,dc=com.ldif similarity index 100% rename from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif rename to dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/dc=example,dc=com.ldif diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/ou=roles,ou=node.ldif similarity index 100% rename from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif rename to dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/ou=roles,ou=node.ldif diff --git a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args new file mode 100644 index 0000000..0945fb9 --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args @@ -0,0 +1 @@ +-Dlog4j.configuration=file:/etc/argeo.d/suite/log4j.properties diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/log4j.properties similarity index 90% rename from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties rename to dist/argeo-suite-standard/rpm/etc/argeo.d/suite/log4j.properties index 35567cc..dbc1b6d 100644 --- a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/log4j.properties @@ -12,7 +12,7 @@ log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [% ## File appender log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.file=/var/log/argeo.d/apaf/node.log +log4j.appender.file.file=/var/log/argeo.d/suite/node.log log4j.appender.file.MaxFileSize=20MB log4j.appender.file.MaxBackupIndex=8 log4j.appender.file.layout=org.apache.log4j.PatternLayout diff --git a/dist/argeo-suite-standard/rpm/etc/systemd/system/argeo@suite.service.d/user.conf b/dist/argeo-suite-standard/rpm/etc/systemd/system/argeo@suite.service.d/user.conf new file mode 100644 index 0000000..b6619bc --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/systemd/system/argeo@suite.service.d/user.conf @@ -0,0 +1,3 @@ +[Service] +User=daemon +Group=daemon \ No newline at end of file diff --git a/dist/pom.xml b/dist/pom.xml index 38c2521..5674fdc 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -11,7 +11,6 @@ Argeo Suite Distributions pom - argeo-suite-demo - argeo-office + argeo-suite-standard -- 2.30.2