From b2aebe80d33fea0ebf071d1b2afb82b40e5263c4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 7 Jul 2020 09:35:29 +0200 Subject: [PATCH] Update cluster demo configurations. --- demo/argeo_node_cluster_0.properties | 39 ---------------------------- demo/argeo_node_cluster_1.properties | 39 ---------------------------- demo/cms-cluster_0.properties | 33 +++++++++++++++++++++++ demo/cms-cluster_1.properties | 33 +++++++++++++++++++++++ 4 files changed, 66 insertions(+), 78 deletions(-) delete mode 100644 demo/argeo_node_cluster_0.properties delete mode 100644 demo/argeo_node_cluster_1.properties create mode 100644 demo/cms-cluster_0.properties create mode 100644 demo/cms-cluster_1.properties diff --git a/demo/argeo_node_cluster_0.properties b/demo/argeo_node_cluster_0.properties deleted file mode 100644 index 2b2575035..000000000 --- a/demo/argeo_node_cluster_0.properties +++ /dev/null @@ -1,39 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi - -argeo.osgi.start.3.node=\ -org.argeo.cms - -argeo.osgi.start.4.apps=\ -org.eclipse.gemini.blueprint.extender - -argeo.osgi.start.4.workbench=\ -org.eclipse.equinox.http.registry,\ - -java.security.manager= -java.security.policy=file:../../all.policy - -argeo.node.repo.type=postgresql_cluster_ds -argeo.node.repo.clusterId=03233754-16c3-49a1-8a00-58bf89a65182 -argeo.node.repo.dburl=jdbc:postgresql://localhost/argeo_node_cluster -argeo.node.repo.dbuser=argeo -argeo.node.repo.dbpassword=argeo - -# HTTP -org.osgi.service.http.port=7070 - -# i18n -argeo.i18n.locales=en,fr,ru -eclipse.registry.MultiLanguage=true -#argeo.i18n.defaultLocale=en - -# Logging -log4j.configuration=file:../../log4j.properties - -# DON'T CHANGE BELOW -org.eclipse.rap.workbenchAutostart=false -org.eclipse.equinox.http.jetty.autostart=false \ No newline at end of file diff --git a/demo/argeo_node_cluster_1.properties b/demo/argeo_node_cluster_1.properties deleted file mode 100644 index 2d35be9dd..000000000 --- a/demo/argeo_node_cluster_1.properties +++ /dev/null @@ -1,39 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi - -argeo.osgi.start.3.node=\ -org.argeo.cms - -argeo.osgi.start.4.apps=\ -org.eclipse.gemini.blueprint.extender - -argeo.osgi.start.4.workbench=\ -org.eclipse.equinox.http.registry,\ - -java.security.manager= -java.security.policy=file:../../all.policy - -argeo.node.repo.type=postgresql_cluster_ds -argeo.node.repo.clusterId=52463fa3-2917-4814-9ff7-685c41cbc7c7 -argeo.node.repo.dburl=jdbc:postgresql://localhost/argeo_node_cluster -argeo.node.repo.dbuser=argeo -argeo.node.repo.dbpassword=argeo - -# HTTP -org.osgi.service.http.port=7071 - -# i18n -argeo.i18n.locales=en,fr,ru -eclipse.registry.MultiLanguage=true -#argeo.i18n.defaultLocale=en - -# Logging -log4j.configuration=file:../../log4j.properties - -# DON'T CHANGE BELOW -org.eclipse.rap.workbenchAutostart=false -org.eclipse.equinox.http.jetty.autostart=false \ No newline at end of file diff --git a/demo/cms-cluster_0.properties b/demo/cms-cluster_0.properties new file mode 100644 index 000000000..c0bb9da2b --- /dev/null +++ b/demo/cms-cluster_0.properties @@ -0,0 +1,33 @@ +argeo.osgi.start.2.node=\ +org.eclipse.equinox.http.servlet,\ +org.eclipse.equinox.metatype,\ +org.eclipse.equinox.cm,\ +org.eclipse.equinox.ds,\ +org.eclipse.rap.rwt.osgi + +argeo.osgi.start.3.node=\ +org.argeo.cms + +argeo.osgi.start.5.node=\ +org.argeo.cms.e4.rap + +# Local +org.osgi.service.http.port=7070 +argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@test-pgsql-ldap:10389/dc=example,dc=com +argeo.node.repo.type=postgresql_cluster_ds +argeo.node.repo.clusterId=03233754-16c3-49a1-8a00-58bf89a65182 +argeo.node.repo.dburl=jdbc:postgresql://test-pgsql-ldap/argeo_cluster +argeo.node.repo.dbuser=argeo +argeo.node.repo.dbpassword=argeo + +# Logging +log4j.configuration=file:../../log4j.properties + +# DON'T CHANGE BELOW +org.eclipse.equinox.http.jetty.autostart=false +org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.security.jgss,\ +com.sun.jndi.dns,\ +com.sun.nio.file,\ +com.sun.nio.sctp diff --git a/demo/cms-cluster_1.properties b/demo/cms-cluster_1.properties new file mode 100644 index 000000000..cf48eab02 --- /dev/null +++ b/demo/cms-cluster_1.properties @@ -0,0 +1,33 @@ +argeo.osgi.start.2.node=\ +org.eclipse.equinox.http.servlet,\ +org.eclipse.equinox.metatype,\ +org.eclipse.equinox.cm,\ +org.eclipse.equinox.ds,\ +org.eclipse.rap.rwt.osgi + +argeo.osgi.start.3.node=\ +org.argeo.cms + +argeo.osgi.start.5.node=\ +org.argeo.cms.e4.rap + +# Local +org.osgi.service.http.port=7071 +argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@test-pgsql-ldap:10389/dc=example,dc=com +argeo.node.repo.type=postgresql_cluster_ds +argeo.node.repo.clusterId=52463fa3-2917-4814-9ff7-685c41cbc7c7 +argeo.node.repo.dburl=jdbc:postgresql://test-pgsql-ldap/argeo_cluster +argeo.node.repo.dbuser=argeo +argeo.node.repo.dbpassword=argeo + +# Logging +log4j.configuration=file:../../log4j.properties + +# DON'T CHANGE BELOW +org.eclipse.equinox.http.jetty.autostart=false +org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.security.jgss,\ +com.sun.jndi.dns,\ +com.sun.nio.file,\ +com.sun.nio.sctp -- 2.30.2