Adapt to update and changes in Argeo TP

diff --git a/org.argeo.suite.cms/bnd.bnd b/org.argeo.suite.cms/bnd.bnd
index 5724a49dbeea059f89449d814741ebdb403e1fe9..f5c82d4c79c9fe73217b712d68a275a1eeb424d3 100644 (file)
--- a/org.argeo.suite.cms/bnd.bnd
+++ b/org.argeo.suite.cms/bnd.bnd
@@ -4,7 +4,6 @@ OSGI-INF/userManagerService.xml,\
 OSGI-INF/resourcesService.xml,\
 OSGI-INF/activitiesService.xml,\
 OSGI-INF/peopleService.xml,\
-OSGI-INF/trackerService.xml,\
 OSGI-INF/documentsService.xml,\
 OSGI-INF/systemMaintenanceService.xml,\
 OSGI-INF/activitiesMaintenanceService.xml,\

diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
index 21bf78e519f3c07d713da8f3c68d44582cd95e41..30c86b582ff17773659351abca819f23ae87afd8 100644 (file)
--- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
+++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
@@ -25,8 +25,12 @@
         </children>
       </children>
       <children xsi:type="advanced:Perspective" xmi:id="_bu5BYD4aEeiR-OuUuIB1Aw" elementId="org.argeo.suite.e4.perspective.folders" label="%folders" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/24/folder.png" tooltip="%folders">
-        <children xsi:type="basic:PartStack" xmi:id="_p66bMD4aEeiR-OuUuIB1Aw" elementId="org.argeo.suite.e4.partstack.0">
+        <children xsi:type="basic:PartStack" xmi:id="_p66bMD4aEeiR-OuUuIB1Aw" elementId="org.argeo.suite.e4.partstack.0" containerData="3000">
           <children xsi:type="basic:Part" xmi:id="_xi1k0DDzEeiUfOa4rxEKwQ" 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 xsi:type="basic:Part" xmi:id="_dr0bwMSbEeifiPIP7QsPQg" elementId="org.argeo.suite.e4.part.search" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.documents.e4.parts.SearchDocumentsView" label="%search" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/search.png"/>
+        </children>
+        <children xsi:type="basic:PartStack" xmi:id="__v8wAMS9EeifiPIP7QsPQg" elementId="org.argeo.suite.e4.partstack.2" containerData="7000">
+          <tags>entityEditorArea</tags>
         </children>
       </children>
     </children>

diff --git a/sdk/argeo-office-e4-rap.properties b/sdk/argeo-office-e4-rap.properties
index 25a3a9fe5d9567035796f612dc633d36c7142587..97d952c9460829a7b0a22b64cf854c8621c23c93 100644 (file)
--- a/sdk/argeo-office-e4-rap.properties
+++ b/sdk/argeo-office-e4-rap.properties
@@ -3,7 +3,8 @@ org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
 org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
-org.eclipse.rap.rwt.osgi
+org.eclipse.rap.rwt.osgi,\
+org.apache.tika.parsers
 
 argeo.osgi.start.3.node=\
 org.argeo.cms
@@ -24,6 +25,8 @@ org.osgi.service.http.port=7070
 argeo.i18n.locales=en,fr,de,ar
 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
 log4j.configuration=file:../../log4j.properties
 

diff --git a/sdk/log4j.properties b/sdk/log4j.properties
index 6cd175797f5156e4582215ab711a5120a64c5be3..4556d88a4feb5b2ced32aadaa16635ae7366d6f4 100644 (file)
--- a/sdk/log4j.properties
+++ b/sdk/log4j.properties
@@ -3,6 +3,9 @@ log4j.rootLogger=WARN, development
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
+log4j.logger.org.apache.tika=DEBUG
+log4j.logger.org.apache.lucene=DEBUG
+#log4j.logger.org.apache.jackrabbit.core.query=TRACE
 
 ## Appenders
 # default appender