Introduce Argeo Suite Standard deployment.
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 9 Jun 2021 07:38:05 +0000 (09:38 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 9 Jun 2021 07:38:05 +0000 (09:38 +0200)
18 files changed:
core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
dep/org.argeo.suite.dep.ui.rap/pom.xml
dist/argeo-office/assembly/argeo-office-e4-rap.xml [deleted file]
dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini [deleted file]
dist/argeo-office/pom.xml [deleted file]
dist/argeo-suite-demo/.gitignore [deleted file]
dist/argeo-suite-demo/rpm/etc/argeo.d/demo/jvm.args [deleted file]
dist/argeo-suite-demo/rpm/etc/systemd/system/argeo@demo.service.d/user.conf [deleted file]
dist/argeo-suite-demo/rpm/var/lib/argeo.d/demo/state/config.ini [deleted file]
dist/argeo-suite-standard/.gitignore [moved from dist/argeo-office/.gitignore with 100% similarity]
dist/argeo-suite-standard/pom.xml [moved from dist/argeo-suite-demo/pom.xml with 56% similarity]
dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini [new file with mode: 0644]
dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/dc=example,dc=com.ldif [moved from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/dc=example,dc=com.ldif with 100% similarity]
dist/argeo-suite-standard/rpm/etc/argeo.d/suite/init/ou=roles,ou=node.ldif [moved from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/init/ou=roles,ou=node.ldif with 100% similarity]
dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args [new file with mode: 0644]
dist/argeo-suite-standard/rpm/etc/argeo.d/suite/log4j.properties [moved from dist/argeo-suite-demo/rpm/etc/argeo.d/demo/log4j.properties with 90% similarity]
dist/argeo-suite-standard/rpm/etc/systemd/system/argeo@suite.service.d/user.conf [new file with mode: 0644]
dist/pom.xml

index c0dbc575f46168064c5df9d9f15c53a85351f9ec..32b6da85d713d011a8fd6a13605faa33b83d50f4 100644 (file)
@@ -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(' ');
index 9ba1c7ff4001dbb3cd46c306dd73100be1a91031..66d2a8c6444179ce85a5b6f3ea8d51861c0b1c3c 100644 (file)
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap</name>
+                                                                       <name>argeo-suite-ui-rap-unstable</name>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-ui-rap</require>
-                                                                               <require>argeo-suite-ui-rap-tp</require>
+                                                                               <require>argeo-suite-ui-rap-tp-unstable</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-ui-rap-tp</name>
+                                                                       <name>argeo-suite-ui-rap-tp-unstable</name>
                                                                        <version>${version.argeo-tp}</version>
                                                                        <release>${maven.build.timestamp}</release>
                                                                        <mappings>
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 (file)
index 30733b4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<assembly
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-       <id>dist</id>
-       <baseDirectory>argeo-office</baseDirectory>
-       <formats>
-               <format>dir</format>
-               <format>zip</format>
-       </formats>
-       <fileSets>
-               <fileSet>
-                       <directory>base</directory>
-                       <outputDirectory></outputDirectory>
-                       <fileMode>0644</fileMode>
-                       <includes>
-                               <include>**</include>
-                       </includes>
-                       <excludes>
-                               <exclude>offline.bat</exclude>
-                       </excludes>
-               </fileSet>
-       </fileSets>
-       <dependencySets>
-               <dependencySet>
-                       <unpack>false</unpack>
-                       <outputFileNameMapping>${artifact.groupId}/${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
-                       <outputDirectory>share/osgi</outputDirectory>
-               </dependencySet>
-               <dependencySet>
-                       <useStrictFiltering>true</useStrictFiltering>
-                       <unpack>true</unpack>
-                       <outputDirectory></outputDirectory>
-                       <includes>
-                               <include>org.argeo.commons:osgi-boot:zip:*:*</include>
-                       </includes>
-               </dependencySet>
-               <dependencySet>
-                       <useStrictFiltering>true</useStrictFiltering>
-                       <unpack>true</unpack>
-                       <outputDirectory></outputDirectory>
-                       <includes>
-                               <include>org.argeo.commons:argeo-node:zip:*:*</include>
-                       </includes>
-               </dependencySet>
-       </dependencySets>
-</assembly>
\ 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 (file)
index 4a6facd..0000000
+++ /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 (file)
index dc4c578..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<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.suite</groupId>
-               <artifactId>dist</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>argeo-office</artifactId>
-       <packaging>pom</packaging>
-       <name>Argeo Office</name>
-       <dependencies>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.suite</groupId> -->
-<!--                   <artifactId>org.argeo.suite.standard</artifactId> -->
-<!--                   <version>2.1.16-SNAPSHOT</version> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.suite</groupId> -->
-<!--                   <artifactId>org.argeo.suite.tracker</artifactId> -->
-<!--                   <version>2.1.16-SNAPSHOT</version> -->
-<!--           </dependency> -->
-       </dependencies>
-       <profiles>
-               <profile>
-                       <id>dist</id>
-                       <dependencies>
-                               <dependency>
-                                       <groupId>org.argeo.suite</groupId>
-                                       <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-                                       <version>2.3.1-SNAPSHOT</version>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>osgi-boot</artifactId>
-                                       <type>zip</type>
-                                       <version>${version.argeo-commons}</version>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>argeo-node</artifactId>
-                                       <type>zip</type>
-                                       <version>${version.argeo-commons}</version>
-                               </dependency>
-                       </dependencies>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-assembly-plugin</artifactId>
-                                               <configuration>
-                                                       <finalName>argeo-suite-${project.version}</finalName>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                                       <descriptors>
-                                                               <descriptor>assembly/argeo-office-e4-rap.xml</descriptor>
-                                                       </descriptors>
-                                               </configuration>
-                                               <executions>
-                                                       <execution>
-                                                               <id>assembly-base</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>single</goal>
-                                                               </goals>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
diff --git a/dist/argeo-suite-demo/.gitignore b/dist/argeo-suite-demo/.gitignore
deleted file mode 100644 (file)
index b83d222..0000000
+++ /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 (file)
index b16559b..0000000
+++ /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 (file)
index 0d23499..0000000
+++ /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 (file)
index 430e83e..0000000
+++ /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
similarity index 56%
rename from dist/argeo-suite-demo/pom.xml
rename to dist/argeo-suite-standard/pom.xml
index c31fc7dedb6a8fb60fa3b433b534b5f6706997ae..a091f2e7dae45fef2570562cc9aae4d4bd8ada84 100644 (file)
@@ -6,9 +6,9 @@
                <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <artifactId>argeo-suite-demo</artifactId>
+       <artifactId>argeo-suite-standard</artifactId>
        <packaging>pom</packaging>
-       <name>Argeo Suite Demo</name>
+       <name>Argeo Suite Standard</name>
        <profiles>
                <profile>
                        <id>rpmbuild</id>
                                                                        <goal>rpm</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <name>argeo-suite-demo</name>
+                                                                       <name>argeo-suite-standard-unstable</name>
                                                                        <mappings>
                                                                                <mapping>
-                                                                                       <directory>/etc/argeo.d/demo</directory>
+                                                                                       <directory>/etc/argeo.d/suite</directory>
                                                                                        <configuration>noreplace</configuration>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>rpm/etc/argeo.d/demo</location>
+                                                                                                       <location>rpm/etc/argeo.d/suite</location>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                                <mapping>
-                                                                                       <directory>/etc/argeo.d/demo/init</directory>
+                                                                                       <directory>/etc/systemd/system/argeo@suite.service.d</directory>
                                                                                        <configuration>noreplace</configuration>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>rpm/etc/argeo.d/demo/init</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/var/lib/argeo.d/demo/state</directory>
-                                                                                       <configuration>noreplace</configuration>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>rpm/var/lib/argeo.d/demo/state</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/etc/systemd/system/argeo@demo.service.d</directory>
-                                                                                       <configuration>noreplace</configuration>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>rpm/etc/systemd/system/argeo@demo.service.d</location>
+                                                                                                       <location>rpm/etc/systemd/system/argeo@suite.service.d</location>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <require>argeo-suite-ui-rap</require>
+                                                                               <require>argeo-suite-ui-rap-unstable</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
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 (file)
index 0000000..8a693fe
--- /dev/null
@@ -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/jvm.args b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args
new file mode 100644 (file)
index 0000000..0945fb9
--- /dev/null
@@ -0,0 +1 @@
+-Dlog4j.configuration=file:/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 35567cc1207bd358d89359329256fb4a339753a1..dbc1b6d37a486da64c042aee1d8a83aad343bde3 100644 (file)
@@ -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 (file)
index 0000000..b6619bc
--- /dev/null
@@ -0,0 +1,3 @@
+[Service]
+User=daemon
+Group=daemon
\ No newline at end of file
index 38c2521bfd38c7e756b3b4dcecfc43e3860f4a44..5674fdcc84646a9276d61f1b8509392d3b2f95cb 100644 (file)
@@ -11,7 +11,6 @@
        <name>Argeo Suite Distributions</name>
        <packaging>pom</packaging>
        <modules>
-               <module>argeo-suite-demo</module>
-               <module>argeo-office</module>
+               <module>argeo-suite-standard</module>
        </modules>
 </project>