From 6fe70073687b4fb9785a137151c2b7788f66080a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 12 Apr 2018 08:41:08 +0200 Subject: [PATCH 01/16] Improve Argeo Office shell --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 6fdf51e..2d3554c 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -4,7 +4,7 @@ shellMaximized - + minimized @@ -17,8 +17,23 @@ + + + + + + + + + + + + + + + @@ -48,7 +63,8 @@ - + + @@ -71,6 +87,9 @@ + + + -- 2.30.2 From 6fa1f8c14fec93620a86f1a93f69df48f24aa411 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 10:43:42 +0200 Subject: [PATCH 02/16] Improve Argeo Office --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 29 ++++++++++++++------- org.argeo.suite.e4/plugin.xml | 17 ------------ 2 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 org.argeo.suite.e4/plugin.xml diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 2d3554c..83cc4d3 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -24,18 +24,13 @@ - - - - - - - - - - + + + + + @@ -62,12 +57,24 @@ + + + + + + + + + + + + @@ -90,6 +97,8 @@ + + diff --git a/org.argeo.suite.e4/plugin.xml b/org.argeo.suite.e4/plugin.xml deleted file mode 100644 index 1b8789e..0000000 --- a/org.argeo.suite.e4/plugin.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - -- 2.30.2 From 6ba0f8543d64d3c4c937d6ec0dc70e1bedf54895 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 11:55:05 +0200 Subject: [PATCH 03/16] Introduce standard Eclipse 4 fragments --- org.argeo.suite.e4/build.properties | 3 +- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 43 +++---------------- .../argeo/suite/e4/parts/QuickSearchView.java | 3 +- org.argeo.suite.standard/.classpath | 7 +++ org.argeo.suite.standard/.gitignore | 2 + org.argeo.suite.standard/.project | 28 ++++++++++++ org.argeo.suite.standard/META-INF/.gitignore | 1 + org.argeo.suite.standard/bnd.bnd | 2 + org.argeo.suite.standard/build.properties | 4 ++ .../e4xmi/standard-toolbars.e4xmi | 41 ++++++++++++++++++ org.argeo.suite.standard/plugin.xml | 12 ++++++ org.argeo.suite.standard/pom.xml | 22 ++++++++++ pom.xml | 1 + 13 files changed, 130 insertions(+), 39 deletions(-) create mode 100644 org.argeo.suite.standard/.classpath create mode 100644 org.argeo.suite.standard/.gitignore create mode 100644 org.argeo.suite.standard/.project create mode 100644 org.argeo.suite.standard/META-INF/.gitignore create mode 100644 org.argeo.suite.standard/bnd.bnd create mode 100644 org.argeo.suite.standard/build.properties create mode 100644 org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi create mode 100644 org.argeo.suite.standard/plugin.xml create mode 100644 org.argeo.suite.standard/pom.xml diff --git a/org.argeo.suite.e4/build.properties b/org.argeo.suite.e4/build.properties index 8795cd4..a811880 100644 --- a/org.argeo.suite.e4/build.properties +++ b/org.argeo.suite.e4/build.properties @@ -3,5 +3,6 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/,\ e4xmi/,\ - plugin.xml + plugin.xml,\ + e4xmi/argeo-suite-toolbars.e4xmi source.. = src/ diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 83cc4d3..f3af3c2 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -8,22 +8,21 @@ minimized - - + + entityEditorArea - + - + - @@ -34,39 +33,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -94,7 +63,7 @@ - + diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java index 3f95d8c..d29db28 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java @@ -33,6 +33,7 @@ import org.argeo.connect.util.XPathUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; +import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProvider; @@ -183,7 +184,7 @@ public class QuickSearchView implements Refreshable { JcrUtils.logoutQuietly(session); } - + @Focus public void setFocus() { refreshFilteredList(); filterTxt.setFocus(); diff --git a/org.argeo.suite.standard/.classpath b/org.argeo.suite.standard/.classpath new file mode 100644 index 0000000..eca7bdb --- /dev/null +++ b/org.argeo.suite.standard/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.suite.standard/.gitignore b/org.argeo.suite.standard/.gitignore new file mode 100644 index 0000000..e0e1cc4 --- /dev/null +++ b/org.argeo.suite.standard/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/target diff --git a/org.argeo.suite.standard/.project b/org.argeo.suite.standard/.project new file mode 100644 index 0000000..22ed203 --- /dev/null +++ b/org.argeo.suite.standard/.project @@ -0,0 +1,28 @@ + + + org.argeo.suite.standard + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.suite.standard/META-INF/.gitignore b/org.argeo.suite.standard/META-INF/.gitignore new file mode 100644 index 0000000..4854a41 --- /dev/null +++ b/org.argeo.suite.standard/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/org.argeo.suite.standard/bnd.bnd b/org.argeo.suite.standard/bnd.bnd new file mode 100644 index 0000000..e2dbcd2 --- /dev/null +++ b/org.argeo.suite.standard/bnd.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.argeo.suite.standard;singleton:=true +Bundle-ActivationPolicy: lazy diff --git a/org.argeo.suite.standard/build.properties b/org.argeo.suite.standard/build.properties new file mode 100644 index 0000000..34d2e4d --- /dev/null +++ b/org.argeo.suite.standard/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi b/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi new file mode 100644 index 0000000..ef70419 --- /dev/null +++ b/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.argeo.suite.standard/plugin.xml b/org.argeo.suite.standard/plugin.xml new file mode 100644 index 0000000..c4d9794 --- /dev/null +++ b/org.argeo.suite.standard/plugin.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/org.argeo.suite.standard/pom.xml b/org.argeo.suite.standard/pom.xml new file mode 100644 index 0000000..1b7bb09 --- /dev/null +++ b/org.argeo.suite.standard/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + org.argeo.suite + argeo-suite + 0.1.13-SNAPSHOT + .. + + org.argeo.suite.standard + Standard Suite + jar + + + org.argeo.suite + org.argeo.suite.e4 + 0.1.13-SNAPSHOT + + + diff --git a/pom.xml b/pom.xml index 46dc56e..079be9a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ org.argeo.suite.cms org.argeo.suite.e4 org.argeo.suite.e4.rap + org.argeo.suite.standard org.argeo.suite.apps -- 2.30.2 From 6c09f7ef0d1ab6652a969b33ac10528bd8721595 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 12:41:36 +0200 Subject: [PATCH 04/16] Eclipse 4 l10n --- org.argeo.suite.e4.rap/bnd.bnd | 1 - .../OSGI-INF/l10n/bundle.properties | 19 ++++++++++++ .../OSGI-INF/l10n/bundle_de.properties | 19 ++++++++++++ org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 29 +++++++++++-------- 4 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 org.argeo.suite.e4/OSGI-INF/l10n/bundle.properties create mode 100644 org.argeo.suite.e4/OSGI-INF/l10n/bundle_de.properties diff --git a/org.argeo.suite.e4.rap/bnd.bnd b/org.argeo.suite.e4.rap/bnd.bnd index e313a60..3b70f9c 100644 --- a/org.argeo.suite.e4.rap/bnd.bnd +++ b/org.argeo.suite.e4.rap/bnd.bnd @@ -1,4 +1,3 @@ -Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/argeo-office-rap.xml Import-Package: org.argeo.node,\ diff --git a/org.argeo.suite.e4/OSGI-INF/l10n/bundle.properties b/org.argeo.suite.e4/OSGI-INF/l10n/bundle.properties new file mode 100644 index 0000000..49b16d4 --- /dev/null +++ b/org.argeo.suite.e4/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,19 @@ +# Standard toolbar +save=Save +saveAll=Save all +closeAll=Close all + +# Dashboard perspective +dashboard=Dashboard +search=Search +documents=Documents + +# Folders perspective +folders=Folders + +# Commands +newEntity=New... + +# Editors +person=Person +organisation=Organisation diff --git a/org.argeo.suite.e4/OSGI-INF/l10n/bundle_de.properties b/org.argeo.suite.e4/OSGI-INF/l10n/bundle_de.properties new file mode 100644 index 0000000..8a025c2 --- /dev/null +++ b/org.argeo.suite.e4/OSGI-INF/l10n/bundle_de.properties @@ -0,0 +1,19 @@ +# Standard toolbar +save=Speichern +saveAll=Alles speichern +closeAll=Alles schließen + +# Dashboard perspective +dashboard=Dashboard +search=Suchen +documents=Dokumente + +# Folders perspective +folders=Folders + +# Commands +newEntity=Neu... + +# Editors +person=Person +organisation=Organisation diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index f3af3c2..1b99551 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -4,22 +4,26 @@ shellMaximized - + minimized - - + + entityEditorArea - + + + + + - + - + @@ -30,9 +34,9 @@ - - - + + + @@ -50,14 +54,14 @@ - - + + - + @@ -75,4 +79,5 @@ + -- 2.30.2 From 0f0c98a8e5f50bb62bce13a8a7d062375532461d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 16:14:18 +0200 Subject: [PATCH 05/16] Activity editor --- org.argeo.suite.e4/bnd.bnd | 1 + org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/org.argeo.suite.e4/bnd.bnd b/org.argeo.suite.e4/bnd.bnd index 37fd8a9..766ba48 100644 --- a/org.argeo.suite.e4/bnd.bnd +++ b/org.argeo.suite.e4/bnd.bnd @@ -11,6 +11,7 @@ javax.jcr.nodetype,\ org.eclipse.e4.core.contexts,\ org.argeo.connect.ui,\ org.argeo.connect.e4,\ +org.argeo.connect.e4.handlers,\ org.argeo.activities.e4,\ org.argeo.people.e4,\ org.argeo.documents.e4,\ diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 1b99551..b1512e8 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -48,6 +48,7 @@ + @@ -61,7 +62,8 @@ - + + @@ -72,6 +74,10 @@ + + + + -- 2.30.2 From f9d4f69167f0a59e303095417ad9f9c913ec8b79 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 21:15:27 +0200 Subject: [PATCH 06/16] Improve E4 app --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index b1512e8..5d3bc8e 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -29,9 +29,9 @@ - + - + -- 2.30.2 From fc791a56da6bbe3813eb1e0990400e0c996fff7b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 22:14:45 +0200 Subject: [PATCH 07/16] Improve E4 app --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 5d3bc8e..f17f707 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -29,10 +29,11 @@ - + + -- 2.30.2 From 03363998fda6ba9b3f91dac71b9a42bc3613290e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Apr 2018 22:44:37 +0200 Subject: [PATCH 08/16] New icons --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index f17f707..9d0c4c2 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -29,7 +29,7 @@ - + @@ -63,7 +63,7 @@ - + -- 2.30.2 From 865a12fed948636c686b5958381227ca3ed52fb5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 18 Apr 2018 10:15:33 +0200 Subject: [PATCH 09/16] Improve quick search view --- .../argeo/suite/e4/parts/QuickSearchView.java | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java index d29db28..ffe8da9 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java @@ -2,6 +2,8 @@ package org.argeo.suite.e4.parts; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; +import java.util.List; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; @@ -34,9 +36,13 @@ import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; import org.eclipse.e4.ui.di.Focus; +import org.eclipse.e4.ui.workbench.modeling.ESelectionService; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; @@ -68,6 +74,9 @@ public class QuickSearchView implements Refreshable { @Inject private SystemWorkbenchService systemWorkbenchService; + @Inject + private ESelectionService selectionService; + // This page widgets private TableViewer entityViewer; private Text filterTxt; @@ -90,6 +99,7 @@ public class QuickSearchView implements Refreshable { refreshFilteredList(); try { + // new String[] { ConnectTypes.CONNECT_ENTITY } session.getWorkspace().getObservationManager().addEventListener(new EventListener() { @Override @@ -97,7 +107,7 @@ public class QuickSearchView implements Refreshable { parent.getDisplay().asyncExec(() -> refreshFilteredList()); } }, Event.PROPERTY_CHANGED | Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED, "/", true, null, - new String[] { ConnectTypes.CONNECT_ENTITY }, true); + null, false); } catch (RepositoryException e) { throw new ConnectException("Cannot add JCR observer", e); } @@ -176,6 +186,16 @@ public class QuickSearchView implements Refreshable { v.setContentProvider(new BasicNodeListContentProvider()); v.addDoubleClickListener(new JcrViewerDClickListener(systemWorkbenchService)); + v.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + List lst = selection.toList(); + if (lst != null && !lst.isEmpty()) + selectionService.setSelection(selection.toList()); + else + selectionService.setSelection(null); + } + }); return v; } @@ -218,6 +238,7 @@ public class QuickSearchView implements Refreshable { // } long begin = System.currentTimeMillis(); + // session.refresh(false); Query xpathQuery = XPathUtils.createQuery(session, xpathQueryStr); xpathQuery.setLimit(ConnectUiConstants.SEARCH_DEFAULT_LIMIT); @@ -235,23 +256,24 @@ public class QuickSearchView implements Refreshable { } } -// public void setRepository(Repository repository) { -// this.repository = repository; -// } -// -// public void setResourcesService(ResourcesService resourcesService) { -// this.resourcesService = resourcesService; -// } -// -// public void setActivitiesService(ActivitiesService activitiesService) { -// this.activitiesService = activitiesService; -// } -// -// public void setPeopleService(PeopleService peopleService) { -// this.peopleService = peopleService; -// } -// -// public void setSystemWorkbenchService(SystemWorkbenchService systemWorkbenchService) { -// this.systemWorkbenchService = systemWorkbenchService; -// } + // public void setRepository(Repository repository) { + // this.repository = repository; + // } + // + // public void setResourcesService(ResourcesService resourcesService) { + // this.resourcesService = resourcesService; + // } + // + // public void setActivitiesService(ActivitiesService activitiesService) { + // this.activitiesService = activitiesService; + // } + // + // public void setPeopleService(PeopleService peopleService) { + // this.peopleService = peopleService; + // } + // + // public void setSystemWorkbenchService(SystemWorkbenchService + // systemWorkbenchService) { + // this.systemWorkbenchService = systemWorkbenchService; + // } } -- 2.30.2 From 89d4f27d82ba14de0857e0d346afc09bf27ec81a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 18 Apr 2018 10:15:41 +0200 Subject: [PATCH 10/16] Update icons --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 9d0c4c2..ed2ac9b 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -4,11 +4,16 @@ shellMaximized - + minimized - + + + + + + @@ -21,7 +26,7 @@ - + @@ -29,15 +34,15 @@ - + - + - - - + + + @@ -79,6 +84,7 @@ + -- 2.30.2 From a6e09fdfaaccf7661c24448b9b1278141cdfeac2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 26 Apr 2018 10:38:26 +0200 Subject: [PATCH 11/16] Improve Argeo Office --- org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index ed2ac9b..d255241 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -36,7 +36,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,8 +61,12 @@ - - + + removeOnHide + + + removeOnHide + -- 2.30.2 From acefd6321fc71f876d9da111f5908f3a78f27aa5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 26 Apr 2018 10:42:06 +0200 Subject: [PATCH 12/16] Use Commons development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 079be9a..8e388a9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.73-SNAPSHOT + 2.1.74-SNAPSHOT org.argeo.suite argeo-suite -- 2.30.2 From 2e2e0edb295c44521daa5d5bba8e7cda15d39a19 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 4 May 2018 18:05:50 +0200 Subject: [PATCH 13/16] RPM packaging --- dep/org.argeo.suite.dep.e4.rap/pom.xml | 44 ++++++++++++++++++-------- dep/org.argeo.suite.dep.e4.rcp/pom.xml | 40 ++++++++++++++++------- dep/org.argeo.suite.platform/pom.xml | 40 ++++++++++++++++------- dep/pom.xml | 13 ++++++++ 4 files changed, 102 insertions(+), 35 deletions(-) diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml index 022b35e..9fdfa81 100644 --- a/dep/org.argeo.suite.dep.e4.rap/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml @@ -39,6 +39,7 @@ org.argeo.connect org.argeo.connect.dep.e4.rap ${version.argeo-connect} + pom @@ -54,26 +55,43 @@ - org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin - copy-argeo + prepare-source package - copy-dependencies + single - jar - ${project.build.directory}/lib-argeo - org.argeo.suite - jar - runtime - true + + a2-source + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo rpm-maven-plugin @@ -85,7 +103,7 @@ rpm - argeo-suite-e4 + argeo-suite-e4-rap /usr/share/osgi @@ -95,7 +113,7 @@ true - ${project.build.directory}/lib-argeo + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source **/*.jar @@ -104,7 +122,7 @@ - argeo-connect-e4-tp + argeo-connect-e4-rap diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml index 02d06ab..0c9c1f6 100644 --- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml @@ -34,6 +34,7 @@ org.argeo.connect org.argeo.connect.dep.e4.rcp ${version.argeo-connect} + pom @@ -49,26 +50,43 @@ - org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin - copy-argeo + prepare-source package - copy-dependencies + single - jar - ${project.build.directory}/lib-argeo - org.argeo.suite - jar - runtime - true + + a2-source + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo rpm-maven-plugin @@ -90,7 +108,7 @@ true - ${project.build.directory}/lib-argeo + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source **/*.jar diff --git a/dep/org.argeo.suite.platform/pom.xml b/dep/org.argeo.suite.platform/pom.xml index 4e6153d..89489ca 100644 --- a/dep/org.argeo.suite.platform/pom.xml +++ b/dep/org.argeo.suite.platform/pom.xml @@ -34,6 +34,7 @@ org.argeo.connect org.argeo.connect.platform ${version.argeo-connect} + pom @@ -49,26 +50,43 @@ - org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin - copy-argeo + prepare-source package - copy-dependencies + single - jar - ${project.build.directory}/lib-argeo - org.argeo.suite - jar - runtime - true + + a2-source + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo rpm-maven-plugin @@ -90,7 +108,7 @@ true - ${project.build.directory}/lib-argeo + ${project.build.directory}/${project.artifactId}-${project.version}-a2-source **/*.jar diff --git a/dep/pom.xml b/dep/pom.xml index 35b76e7..56b90d0 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -39,6 +39,19 @@ + + maven-assembly-plugin + + + org.argeo.commons + assembly-descriptors + ${version.argeo-commons} + + + + false + + -- 2.30.2 From 6ab918c8088898d24f1e7e2966a7b702f20371a5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 5 May 2018 19:21:36 +0200 Subject: [PATCH 14/16] Argeo Office packaged as zip --- dist/argeo-office/.gitignore | 1 + .../assembly/argeo-office-e4-rap.xml | 47 ++++++++ .../base/etc/argeo/conf.d/argeo-office.ini | 5 + dist/argeo-office/pom.xml | 107 ++++++++++++++++++ dist/pom.xml | 16 +++ pom.xml | 1 + 6 files changed, 177 insertions(+) create mode 100644 dist/argeo-office/.gitignore create mode 100644 dist/argeo-office/assembly/argeo-office-e4-rap.xml create mode 100644 dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini create mode 100644 dist/argeo-office/pom.xml create mode 100644 dist/pom.xml diff --git a/dist/argeo-office/.gitignore b/dist/argeo-office/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/dist/argeo-office/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/dist/argeo-office/assembly/argeo-office-e4-rap.xml b/dist/argeo-office/assembly/argeo-office-e4-rap.xml new file mode 100644 index 0000000..30733b4 --- /dev/null +++ b/dist/argeo-office/assembly/argeo-office-e4-rap.xml @@ -0,0 +1,47 @@ + + 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 new file mode 100644 index 0000000..cbfa365 --- /dev/null +++ b/dist/argeo-office/base/etc/argeo/conf.d/argeo-office.ini @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000..0cf70b9 --- /dev/null +++ b/dist/argeo-office/pom.xml @@ -0,0 +1,107 @@ + + 4.0.0 + + org.argeo.suite + dist + 0.1.13-SNAPSHOT + .. + + argeo-office + pom + Argeo Office + + + dist + + + org.argeo.suite + org.argeo.suite.dep.e4.rap + 0.1.13-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 + + + + + + + + + rpmbuild + + + + org.codehaus.mojo + rpm-maven-plugin + + + rpm-node + package + + rpm + + + argeo-office + + + /etc/node/conf.d + root + node + 640 + noreplace + false + + + base/etc/node/conf.d + + *.ini + *.txt + + + + + + + argeo-suite-e4-rap + + + + + + + + + + diff --git a/dist/pom.xml b/dist/pom.xml new file mode 100644 index 0000000..516e3c3 --- /dev/null +++ b/dist/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + org.argeo.suite + argeo-suite + 0.1.13-SNAPSHOT + .. + + dist + Argeo Suite Distributions + pom + + argeo-office + + diff --git a/pom.xml b/pom.xml index 8e388a9..2af0413 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ org.argeo.suite.workbench.rap dep + dist 0.1.13-SNAPSHOT -- 2.30.2 From 4d6f889ecaf4bdbc9cc76b6cbd6039445bac2bb6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 5 May 2018 20:54:08 +0200 Subject: [PATCH 15/16] RPM packaging --- dist/.gitignore | 1 + dist/argeo-office/pom.xml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 dist/.gitignore diff --git a/dist/.gitignore b/dist/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/dist/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml index 0cf70b9..ed611ba 100644 --- a/dist/argeo-office/pom.xml +++ b/dist/argeo-office/pom.xml @@ -76,15 +76,15 @@ argeo-office - /etc/node/conf.d + /etc/argeo/conf.d root - node + argeo 640 noreplace false - base/etc/node/conf.d + base/etc/argeo/conf.d *.ini *.txt @@ -94,6 +94,7 @@ + argeo-node argeo-suite-e4-rap -- 2.30.2 From 3b336c600aad1a7a982d01133ce243da98e828e9 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 7 May 2018 17:45:10 +0200 Subject: [PATCH 16/16] Inject UserAdminService in PeopleService --- org.argeo.suite.cms/OSGI-INF/peopleService.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/org.argeo.suite.cms/OSGI-INF/peopleService.xml b/org.argeo.suite.cms/OSGI-INF/peopleService.xml index b734946..0286f7c 100644 --- a/org.argeo.suite.cms/OSGI-INF/peopleService.xml +++ b/org.argeo.suite.cms/OSGI-INF/peopleService.xml @@ -6,4 +6,5 @@ + -- 2.30.2