From: Mathieu Date: Tue, 21 Feb 2023 10:55:23 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/unstable' into testing X-Git-Tag: v2.1.27~1^2~1 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=407704b7c055152466ef25ce5cead4b68df1e2cc;hp=b92fef906030d10f7b1fa942e0514d9c13e05c11;p=gpl%2Fargeo-suite.git Merge remote-tracking branch 'origin/unstable' into testing --- diff --git a/README b/README new file mode 100644 index 0000000..40fb60c --- /dev/null +++ b/README @@ -0,0 +1,21 @@ +Argeo Suite provides components and APIs to build productivity or reporting appalications. + +## Build +Prerequisites to build this layer: +- build Argeo TP +- build Argeo Commons +- build Argeo JCR +(cf. http://git.argeo.org) + +Then, run: + +git clone http://git.argeo.org/gpl/argeo-suite.git --recursive +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/ +./argeo-suite/configure + +cd argeo-suite +make clean all + +In order to use it within an Eclipse PDE environment: + +make clean all manifests \ No newline at end of file diff --git a/sdk/argeo-suite-desktop.properties b/sdk/argeo-suite-desktop.properties new file mode 100644 index 0000000..7781822 --- /dev/null +++ b/sdk/argeo-suite-desktop.properties @@ -0,0 +1,40 @@ +argeo.osgi.start.2=\ +org.apache.felix.scr,\ +org.argeo.init + +argeo.osgi.start.3=\ +org.argeo.cms,\ +org.argeo.cms.swt.rcp,\ +org.argeo.cms.ee,\ +org.argeo.cms.lib.dbus,\ + +argeo.osgi.start.4=\ +org.argeo.cms.jcr + +argeo.osgi.start.5=\ +org.argeo.app.profile.acr.fs,\ +org.argeo.app.core,\ +org.argeo.app.ui,\ +org.argeo.app.theme.default,\ + + +# Local +argeo.node.repo.type=h2 +argeo.http.port=7070 + +#argeo.directory=os:/// +argeo.directory=ipa:/// + +# Logging +log.org.argeo=DEBUG + +# DON'T CHANGE BELOW +org.eclipse.equinox.http.jetty.autostart=false +org.osgi.framework.system.packages.extra=\ +com.sun.net.httpserver,\ +com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.jndi.dns,\ +com.sun.security.jgss,\ +com.sun.nio.file,\ +com.sun.nio.sctp \ No newline at end of file diff --git a/sdk/argeo-suite-rcp.properties b/sdk/argeo-suite-rcp.properties deleted file mode 100644 index ea6457e..0000000 --- a/sdk/argeo-suite-rcp.properties +++ /dev/null @@ -1,50 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ -org.argeo.init - -argeo.osgi.start.2.suite=\ -org.apache.tika.parsers - -argeo.osgi.start.3.node=\ -org.argeo.cms,\ -org.argeo.cms.jcr,\ -org.argeo.cms.servlet,\ -org.argeo.cms.ui.rcp - -argeo.osgi.start.5.suite=\ -org.argeo.app.core,\ -org.argeo.app.ui,\ -org.argeo.app.theme.default,\ - -argeo.osgi.start.6.suite=\ -org.argeo.app.servlet.publish,\ -org.argeo.app.servlet.odk - - -# Local -argeo.node.repo.type=h2 -org.osgi.service.http.port=0 -#org.osgi.service.http.port.secure=7073 - -#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com - -argeo.node.init=../../init - -argeo.i18n.locales=en,fr -argeo.i18n.defaultLocale=en - -#tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml - -# Logging -log.org.argeo=DEBUG - -# 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/sdk/argeo-suite-server.properties b/sdk/argeo-suite-server.properties new file mode 100644 index 0000000..82576bf --- /dev/null +++ b/sdk/argeo-suite-server.properties @@ -0,0 +1,46 @@ +argeo.osgi.start.2=\ +org.eclipse.equinox.http.servlet,\ +org.apache.felix.scr,\ +org.eclipse.rap.rwt.osgi,\ +org.argeo.init + +argeo.osgi.start.3=\ +org.argeo.cms,\ +org.argeo.cms.swt.rap,\ +org.argeo.cms.swt.rcp,\ +org.argeo.cms.ee,\ +org.argeo.cms.lib.sshd,\ +org.argeo.cms.lib.equinox,\ +org.argeo.cms.lib.jetty,\ + +argeo.osgi.start.4=\ +org.argeo.cms.jcr + +argeo.osgi.start.5=\ +org.argeo.app.profile.acr.fs,\ +org.argeo.app.core,\ +org.argeo.app.ui,\ +org.argeo.app.theme.default,\ +org.argeo.app.servlet.publish,\ +org.argeo.app.servlet.odk + + +# Local +argeo.node.repo.type=h2 +argeo.http.port=7070 + +argeo.directory=dc=example,dc=com + +# Logging +log.org.argeo=DEBUG + +# DON'T CHANGE BELOW +org.eclipse.equinox.http.jetty.autostart=false +org.osgi.framework.system.packages.extra=\ +com.sun.net.httpserver,\ +com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.jndi.dns,\ +com.sun.security.jgss,\ +com.sun.nio.file,\ +com.sun.nio.sctp \ No newline at end of file diff --git a/sdk/argeo-suite.properties b/sdk/argeo-suite.properties deleted file mode 100644 index 5de69f5..0000000 --- a/sdk/argeo-suite.properties +++ /dev/null @@ -1,47 +0,0 @@ -argeo.osgi.start.2=\ -org.eclipse.equinox.http.servlet,\ -org.apache.felix.scr,\ -org.eclipse.rap.rwt.osgi,\ -org.apache.tika.parsers,\ -org.argeo.init - -argeo.osgi.start.3=\ -org.argeo.cms,\ -org.argeo.cms.swt.rap,\ -org.argeo.cms.swt.rcp,\ -org.argeo.cms.ee,\ -org.argeo.cms.lib.sshd,\ -org.argeo.cms.lib.equinox,\ -org.argeo.cms.lib.jetty,\ - -argeo.osgi.start.4=\ -org.argeo.cms.jcr - -argeo.osgi.start.5=\ -org.argeo.app.profile.acr.fs,\ -org.argeo.app.core,\ -org.argeo.app.ui,\ -org.argeo.app.theme.default,\ -org.argeo.app.servlet.publish,\ -org.argeo.app.servlet.odk - - -# Local -argeo.node.repo.type=h2 -argeo.http.port=7070 - -argeo.directory=dc=example,dc=com - -# Logging -log.org.argeo=DEBUG - -# DON'T CHANGE BELOW -org.eclipse.equinox.http.jetty.autostart=false -org.osgi.framework.system.packages.extra=\ -com.sun.net.httpserver,\ -com.sun.jndi.ldap,\ -com.sun.jndi.ldap.sasl,\ -com.sun.jndi.dns,\ -com.sun.security.jgss,\ -com.sun.nio.file,\ -com.sun.nio.sctp \ No newline at end of file diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java index b34c605..5047151 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java @@ -1,6 +1,7 @@ package org.argeo.app.ui.library; import org.argeo.api.acr.Content; +import org.argeo.api.acr.NamespaceUtils; import org.argeo.api.acr.spi.ProvidedContent; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.ux.CmsView; @@ -26,7 +27,7 @@ public class ContentEntryArea implements SwtUiProvider { new Label(parent, 0).setText(context.toString()); - Content rootContent = ((ProvidedContent) context).getSession().getRepository().get().get("/srv"); + Content rootContent = ((ProvidedContent) context).getSession().getRepository().get().get("/sys"); ContentHierarchicalPart contentPart = new ContentHierarchicalPart() { @@ -36,7 +37,9 @@ public class ContentEntryArea implements SwtUiProvider { return true; return super.isLeaf(content); } + }; + contentPart.addColumn((c) -> NamespaceUtils.toPrefixedName(c.getName())); contentPart.setInput(rootContent); SwtTreeView view = new SwtTreeView<>(parent, 0, contentPart);