Tags working in E4

diff --git a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
index 52450ee53e81475c5dd57581e5b3c25b3802aded..5385eb2b9b0b5333460d471065ce8d55588cc188 100644 (file)
--- a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
@@ -4,4 +4,5 @@
    <service>
       <provide interface="org.argeo.connect.AppMaintenanceService"/>
    </service>
    <service>
       <provide interface="org.argeo.connect.AppMaintenanceService"/>
    </service>

+   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" name="ResourcesService" policy="static"/>

 </scr:component>
 </scr:component>

diff --git a/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
index 511d2854b7b5cee9cefb66eafca789af923dd8f2..af90a466cf67b4fcb85ad3fe89aec2059b55e4c5 100644 (file)
--- a/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" immediate="true" name="System Maintenance Service">
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" immediate="true" name="System Maintenance Service">

-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=connect)"/>

    <service>
       <provide interface="org.argeo.connect.SystemMaintenanceService"/>
    </service>
    <service>
       <provide interface="org.argeo.connect.SystemMaintenanceService"/>
    </service>

diff --git a/org.argeo.suite.e4/OSGI-INF/resourcesE4Service.xml b/org.argeo.suite.e4/OSGI-INF/resourcesE4Service.xml
new file mode 100644 (file)
index 0000000..7617639
--- /dev/null
+++ b/org.argeo.suite.e4/OSGI-INF/resourcesE4Service.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.argeo.suite.e4">
+   <implementation class="org.argeo.connect.e4.resources.ResourcesE4Service"/>
+   <service>
+      <provide interface="org.argeo.connect.e4.AppE4Service"/>
+      <provide interface="org.argeo.connect.ui.AppWorkbenchService"/>
+   </service>
+</scr:component>

diff --git a/org.argeo.suite.e4/bnd.bnd b/org.argeo.suite.e4/bnd.bnd
index ba553ca427e0a2b4c5898b88ae48de9488574826..e9b5c57e0fc4ed788489a03e7c53cbc4096f2a35 100644 (file)
--- a/org.argeo.suite.e4/bnd.bnd
+++ b/org.argeo.suite.e4/bnd.bnd
@@ -1,5 +1,6 @@
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/systemE4Service.xml,\
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/systemE4Service.xml,\

+OSGI-INF/resourcesE4Service.xml,\

 OSGI-INF/activitiesE4Service.xml,\
 OSGI-INF/peopleE4Service.xml,\
 OSGI-INF/trackerE4Service.xml,\
 OSGI-INF/activitiesE4Service.xml,\
 OSGI-INF/peopleE4Service.xml,\
 OSGI-INF/trackerE4Service.xml,\

diff --git a/org.argeo.suite.e4/build.properties b/org.argeo.suite.e4/build.properties
index a8118803f2d30884ba94fcd73126011aa9dd4805..afd687337c8db70ec98015c80f58f43a12160c8b 100644 (file)
--- a/org.argeo.suite.e4/build.properties
+++ b/org.argeo.suite.e4/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                e4xmi/,\
                plugin.xml,\
                OSGI-INF/,\
                e4xmi/,\
                plugin.xml,\

-               e4xmi/argeo-suite-toolbars.e4xmi
+               e4xmi/argeo-suite-toolbars.e4xmi,\
+               OSGI-INF/resourcesE4Service.xml

 source.. = src/
 source.. = src/

diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
index 1014ad16b48961e02e8aaf5847e0f43a58928761..2506efee11c09d151f870e6b1c40d82259a53900 100644 (file)
--- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
+++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
@@ -14,7 +14,6 @@
                 <children xsi:type="menu:HandledToolItem" xmi:id="_DvXJIELbEeim_a9htzedPA" elementId="org.argeo.suite.e4.handledtoolitem.0" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/delete.png" command="_EvkB4ELbEeim_a9htzedPA"/>
               </toolbar>
             </children>
                 <children xsi:type="menu:HandledToolItem" xmi:id="_DvXJIELbEeim_a9htzedPA" elementId="org.argeo.suite.e4.handledtoolitem.0" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/delete.png" command="_EvkB4ELbEeim_a9htzedPA"/>
               </toolbar>
             </children>

-            <children xsi:type="basic:Part" xmi:id="_yNz1oEIkEeiuKIc56c-N_g" elementId="org.argeo.suite.e4.part.documents" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.documents.e4.parts.MyFilesView" label="%documents" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/documents.png"/>

           </children>
           <children xsi:type="basic:PartStack" xmi:id="_vLza4DAVEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.partstack.1" containerData="7000">
             <tags>entityEditorArea</tags>
           </children>
           <children xsi:type="basic:PartStack" xmi:id="_vLza4DAVEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.partstack.1" containerData="7000">
             <tags>entityEditorArea</tags>


@@ -75,6 +74,8 @@
   <descriptors xmi:id="_vnVAMDpQEeiqA-HRq--JMg" elementId="org.argeo.suite.e4.partdescriptor.projectEditor" label="Project" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/project.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.tracker.e4.parts.ProjectEditor"/>
   <descriptors xmi:id="_TZol8DpREeiqA-HRq--JMg" elementId="org.argeo.suite.e4.partdescriptor.milestoneEditor" label="Milestone" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/milestone.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.tracker.e4.parts.MilestoneEditor"/>
   <descriptors xmi:id="_q__ZsEJIEeij3Nr_iRrJtw" elementId="org.argeo.suite.e4.partdescriptor.activityEditor" label="Activity" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/activity.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.activities.e4.parts.ActivityEditor"/>
   <descriptors xmi:id="_vnVAMDpQEeiqA-HRq--JMg" elementId="org.argeo.suite.e4.partdescriptor.projectEditor" label="Project" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/project.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.tracker.e4.parts.ProjectEditor"/>
   <descriptors xmi:id="_TZol8DpREeiqA-HRq--JMg" elementId="org.argeo.suite.e4.partdescriptor.milestoneEditor" label="Milestone" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/milestone.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.tracker.e4.parts.MilestoneEditor"/>
   <descriptors xmi:id="_q__ZsEJIEeij3Nr_iRrJtw" elementId="org.argeo.suite.e4.partdescriptor.activityEditor" label="Activity" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/activity.png" allowMultiple="true" category="entityEditorArea" closeable="true" dirtyable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.activities.e4.parts.ActivityEditor"/>

+  <descriptors xmi:id="_OqeE8FeZEeiknZQLx-vtnA" elementId="org.argeo.suite.e4.partdescriptor.tagEditor" label="Tag" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/tag.png" allowMultiple="true" closeable="true" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.resources.parts.TagEditor"/>
+  <descriptors xmi:id="_xvss0FeaEeiknZQLx-vtnA" elementId="org.argeo.suite.e4.partdescriptor.searchEntityPart" label="Search Entity" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/search.png" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.parts.DefaultSearchEntityEditor"/>

   <commands xmi:id="_2Xkt8DApEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.command.createEntity" commandName="New Entity">
     <parameters xmi:id="_GnXrcDAsEei3AbO1ldMI0w" elementId="targetNodeType" name="targetNodeType" optional="false"/>
   </commands>
   <commands xmi:id="_2Xkt8DApEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.command.createEntity" commandName="New Entity">
     <parameters xmi:id="_GnXrcDAsEei3AbO1ldMI0w" elementId="targetNodeType" name="targetNodeType" optional="false"/>
   </commands>