projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d454419
)
Adapt Tracker to changes in Argeo Connect.
author
Mathieu Baudier <mbaudier@argeo.org>
Tue, 15 Sep 2020 06:10:55 +0000
(08:10 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Tue, 15 Sep 2020 06:10:55 +0000
(08:10 +0200)
org.argeo.suite.tracker/.project
patch
|
blob
|
history
org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
patch
|
blob
|
history
org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
patch
|
blob
|
history
org.argeo.suite.tracker/bnd.bnd
patch
|
blob
|
history
org.argeo.suite.tracker/build.properties
patch
|
blob
|
history
sdk/argeo-office-e4-rap.properties
patch
|
blob
|
history
diff --git
a/org.argeo.suite.tracker/.project
b/org.argeo.suite.tracker/.project
index e22cda3fc0ff938ac666d987d52fc22c0bfd12f5..b5e6542c8c1622a9e9b9b5c9d26e69b1e1aef858 100644
(file)
--- a/
org.argeo.suite.tracker/.project
+++ b/
org.argeo.suite.tracker/.project
@@
-20,6
+20,11
@@
<arguments>
</arguments>
</buildCommand>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git
a/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
b/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
index f79ea3e11746822877dd8709d785e3ad7e97e300..c768361c07b5ec75167a4165c32418bf16071d5f 100644
(file)
--- a/
org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
+++ b/
org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
@@
-7,6
+7,6
@@
</service>
<property name="service.ranking" type="Integer" value="10"/>
<reference bind="setActivitiesService" cardinality="1..1" interface="org.argeo.activities.ActivitiesService" name="ActivitiesService" policy="static"/>
</service>
<property name="service.ranking" type="Integer" value="10"/>
<reference bind="setActivitiesService" cardinality="1..1" interface="org.argeo.activities.ActivitiesService" name="ActivitiesService" policy="static"/>
- <reference bind="set
UserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService
" policy="static"/>
+ <reference bind="set
CmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager
" policy="static"/>
<reference bind="setTrackerService" cardinality="1..1" interface="org.argeo.tracker.TrackerService" name="TrackerService" policy="static"/>
</scr:component>
<reference bind="setTrackerService" cardinality="1..1" interface="org.argeo.tracker.TrackerService" name="TrackerService" policy="static"/>
</scr:component>
diff --git
a/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
b/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
index 669f9c32d1c64e49eef2931ff8867ea6ccd79b53..994282db710c583af044935e26374d801a981676 100644
(file)
--- a/
org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
+++ b/
org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
@@
-5,5
+5,5
@@
<provide interface="org.argeo.connect.AppMaintenanceService"/>
</service>
<reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=connect)"/>
<provide interface="org.argeo.connect.AppMaintenanceService"/>
</service>
<reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=connect)"/>
- <reference bind="set
UserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService
" policy="static"/>
+ <reference bind="set
CmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager
" policy="static"/>
</scr:component>
</scr:component>
diff --git
a/org.argeo.suite.tracker/bnd.bnd
b/org.argeo.suite.tracker/bnd.bnd
index 17336a4530084646d7841be6b1256d4346037b0b..72ab4d2441f74c78044e53ef89b4ade74f3e8a1b 100644
(file)
--- a/
org.argeo.suite.tracker/bnd.bnd
+++ b/
org.argeo.suite.tracker/bnd.bnd
@@
-11,4
+11,6
@@
org.argeo.activities,\
org.argeo.tracker,\
org.argeo.tracker.core,\
org.argeo.tracker.e4,\
org.argeo.tracker,\
org.argeo.tracker.core,\
org.argeo.tracker.e4,\
+org.argeo.cms,\
+org.argeo.connect.ui,\
*
*
diff --git
a/org.argeo.suite.tracker/build.properties
b/org.argeo.suite.tracker/build.properties
index 995c040612352019854873d6e3995226c1c28846..6dad7ac5e4df2669146d49cd04057fd17ea5cdc4 100644
(file)
--- a/
org.argeo.suite.tracker/build.properties
+++ b/
org.argeo.suite.tracker/build.properties
@@
-2,5
+2,6
@@
output.. = bin/
bin.includes = META-INF/,\
.,\
e4xmi/,\
bin.includes = META-INF/,\
.,\
e4xmi/,\
- plugin.xml
+ plugin.xml,\
+ OSGI-INF/
source.. = src/
source.. = src/
diff --git
a/sdk/argeo-office-e4-rap.properties
b/sdk/argeo-office-e4-rap.properties
index 61c678c9c2846feff49dc6a28916c8a6adc78e6a..00026189d7cc2af21e2aab18ce9fea8b6133bbf0 100644
(file)
--- a/
sdk/argeo-office-e4-rap.properties
+++ b/
sdk/argeo-office-e4-rap.properties
@@
-11,10
+11,10
@@
argeo.osgi.start.3.node=\
org.argeo.cms
argeo.osgi.start.5.suite=\
org.argeo.cms
argeo.osgi.start.5.suite=\
-org.argeo.suite.cms
-
-
argeo.osgi.start.5.suite=
\
-org.argeo.suite.
e4.rap
+org.argeo.suite.cms
,\
+org.argeo.suite.e4.rap,\
+
org.argeo.suite.standard,
\
+org.argeo.suite.
tracker
# Local
argeo.node.repo.type=h2
# Local
argeo.node.repo.type=h2