From: Mathieu Baudier Date: Wed, 9 Jun 2021 07:38:05 +0000 (+0200) Subject: Introduce Argeo Suite Standard deployment. X-Git-Tag: argeo-suite-2.3.1~46 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=166340db957d4b72d7f6d0a077bdb639220333c3 Introduce Argeo Suite Standard deployment. --- 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/.gitignore b/dist/argeo-office/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/dist/argeo-office/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ 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/pom.xml b/dist/argeo-suite-demo/pom.xml deleted file mode 100644 index c31fc7d..0000000 --- a/dist/argeo-suite-demo/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - 4.0.0 - - org.argeo.suite - dist - 2.3.1-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 deleted file mode 100644 index f5202df..0000000 --- a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index d608c2b..0000000 --- a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif +++ /dev/null @@ -1,74 +0,0 @@ -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 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/argeo.d/demo/log4j.properties b/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties deleted file mode 100644 index 35567cc..0000000 --- a/dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties +++ /dev/null @@ -1,19 +0,0 @@ -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 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-suite-standard/.gitignore b/dist/argeo-suite-standard/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/dist/argeo-suite-standard/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml new file mode 100644 index 0000000..a091f2e --- /dev/null +++ b/dist/argeo-suite-standard/pom.xml @@ -0,0 +1,62 @@ + + 4.0.0 + + org.argeo.suite + dist + 2.3.1-SNAPSHOT + .. + + argeo-suite-standard + pom + Argeo Suite Standard + + + rpmbuild + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm + package + + rpm + + + argeo-suite-standard-unstable + + + /etc/argeo.d/suite + noreplace + false + + + rpm/etc/argeo.d/suite + + + + + /etc/systemd/system/argeo@suite.service.d + noreplace + false + + + rpm/etc/systemd/system/argeo@suite.service.d + + + + + + 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-standard/rpm/etc/argeo.d/suite/init/dc=example,dc=com.ldif b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/dc=example,dc=com.ldif new file mode 100644 index 0000000..f5202df --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/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-standard/rpm/etc/argeo.d/suite/init/ou=roles,ou=node.ldif b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/ou=roles,ou=node.ldif new file mode 100644 index 0000000..d608c2b --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/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-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-standard/rpm/etc/argeo.d/suite/log4j.properties b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/log4j.properties new file mode 100644 index 0000000..dbc1b6d --- /dev/null +++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/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/suite/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-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