From 0334f9831eba6b5c068f0092ea15396cb2a83e9c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 23 Oct 2020 14:32:20 +0200 Subject: [PATCH] Introduce Argeo Suite Demo. --- dep/org.argeo.suite.dep.ui.rap/pom.xml | 7 ++ dist/argeo-suite-demo/pom.xml | 82 +++++++++++++++++++ .../argeo.d/demo/init/dc=example,dc=com.ldif | 51 ++++++++++++ .../argeo.d/demo/init/ou=roles,ou=node.ldif | 74 +++++++++++++++++ .../rpm/etc/argeo.d/demo/jvm.args | 1 + .../rpm/etc/argeo.d/demo/log4j.properties | 19 +++++ .../system/argeo@demo.service.d/user.conf | 3 + .../rpm/var/lib/argeo.d/demo/state/config.ini | 16 ++++ dist/pom.xml | 18 +--- 9 files changed, 254 insertions(+), 17 deletions(-) create mode 100644 dist/argeo-suite-demo/pom.xml create mode 100644 dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif create mode 100644 dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif create mode 100644 dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args create mode 100644 dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties create mode 100644 dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf create mode 100644 dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index 66858c2..fa251f4 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -52,6 +52,13 @@ 2.1.16-SNAPSHOT + + + org.argeo.suite + org.argeo.documents.ui + 2.1.16-SNAPSHOT + + org.argeo.suite diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml new file mode 100644 index 0000000..e4e1fc7 --- /dev/null +++ b/dist/argeo-suite-demo/pom.xml @@ -0,0 +1,82 @@ + + 4.0.0 + + org.argeo.suite + dist + 2.1.16-SNAPSHOT + .. + + argeo-suite-demo + pom + Argeo Suite Demo + + + rpmbuild + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm + package + + rpm + + + argeo-suite-demo + + + /etc/argeo.d/demo + noreplace + false + + + rpm/etc/argeo.d/demo + + + + + /etc/argeo.d/demo/init + 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 + + + + + + argeo-suite-ui-rap + + + + + + + + + + diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif new file mode 100644 index 0000000..f5202df --- /dev/null +++ b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif @@ -0,0 +1,51 @@ +dn: dc=example,dc=com +dc: example +objectClass: dcObject + +dn: ou=People,dc=example,dc=com +objectClass: top +objectClass: organizationalUnit + +dn: ou=Groups,dc=example,dc=com +objectClass: top +objectClass: organizationalUnit + +dn: uid=coworker,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +objectClass: organizationalPerson +objectClass: person +objectClass: top +givenName: John +sn: Coworker +userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 +mail: coworker@localhost +uid: coworker +cn: John Coworker +description: A regular coworker + +dn: uid=manager,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +objectClass: organizationalPerson +objectClass: person +objectClass: top +givenName: Mary +sn: Manager +userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 +mail: manager@localhost +uid: manager +cn: Mary Manager +description: A manager + +dn: uid=root,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +objectClass: person +objectClass: organizationalPerson +objectClass: top +givenName: Super +sn: User +userPassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 +mail: root@localhost +uid: root +cn: Super User +description: Superuser + diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif new file mode 100644 index 0000000..d608c2b --- /dev/null +++ b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif @@ -0,0 +1,74 @@ +dn: cn=admin,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: admin +member: uid=root,ou=People,dc=example,dc=com + +dn: cn=org.argeo.activities.editor,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.activities.editor +member: cn=org.argeo.office.manager,ou=roles,ou=node + +dn: cn=org.argeo.activities.reader,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.activities.reader +member: cn=org.argeo.office.coworker,ou=roles,ou=node + +dn: cn=org.argeo.connect.resources.editor,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.connect.resources.editor +member: cn=org.argeo.office.manager,ou=roles,ou=node + +dn: cn=org.argeo.connect.resources.reader,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.connect.resources.reader +member: cn=org.argeo.office.coworker,ou=roles,ou=node + +dn: cn=org.argeo.office.coworker,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.office.coworker +member: cn=org.argeo.office.manager,ou=roles,ou=node +member: uid=coworker,ou=People,dc=example,dc=com + +dn: cn=org.argeo.office.manager,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.office.manager +member: uid=manager,ou=People,dc=example,dc=com +member: uid=root,ou=People,dc=example,dc=com + +dn: cn=org.argeo.people.editor,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.people.editor +member: cn=org.argeo.office.manager,ou=roles,ou=node + +dn: cn=org.argeo.people.reader,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.people.reader +member: cn=org.argeo.office.coworker,ou=roles,ou=node + +dn: cn=org.argeo.tracker.editor,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.tracker.editor +member: cn=org.argeo.office.manager,ou=roles,ou=node + +dn: cn=org.argeo.tracker.reader,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: org.argeo.tracker.reader +member: cn=org.argeo.office.coworker,ou=roles,ou=node + +dn: cn=userAdmin,ou=roles,ou=node +objectClass: groupOfNames +objectClass: top +cn: userAdmin +member: cn=admin,ou=roles,ou=node + 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 new file mode 100644 index 0000000..b16559b --- /dev/null +++ b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args @@ -0,0 +1 @@ +-Dlog4j.configuration=file:/etc/argeo.d/demo/log4j.properties diff --git a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties new file mode 100644 index 0000000..35567cc --- /dev/null +++ b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties @@ -0,0 +1,19 @@ +log4j.rootLogger=WARN, console, file + +## Levels +log4j.logger.org.argeo=DEBUG +log4j.logger.org.djapps.on=DEBUG + +## Appenders +# default appender +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n + +## File appender +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.file=/var/log/argeo.d/apaf/node.log +log4j.appender.file.MaxFileSize=20MB +log4j.appender.file.MaxBackupIndex=8 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %m [%t] %p %n \ No newline at end of file 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 new file mode 100644 index 0000000..0d23499 --- /dev/null +++ b/dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf @@ -0,0 +1,3 @@ +[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 new file mode 100644 index 0000000..430e83e --- /dev/null +++ b/dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini @@ -0,0 +1,16 @@ +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/pom.xml b/dist/pom.xml index 2336e8f..b3b8a0c 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -11,23 +11,7 @@ Argeo Suite Distributions pom + argeo-suite-demo argeo-office - - - - maven-assembly-plugin - - - org.argeo.commons - assembly-descriptors - ${version.argeo-commons} - - - - false - - - - -- 2.30.2