Activate web UI

diff --git a/org.argeo.suite.apps.web/META-INF/spring/osgi.xml b/org.argeo.suite.apps.web/META-INF/spring/osgi.xml
index 1eb932d2d05a8ca9926565e92b4f386776e4953b..2ef3e0dea40e337321bfb0ef37b0a962ff4be0b3 100644 (file)
--- a/org.argeo.suite.apps.web/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.apps.web/META-INF/spring/osgi.xml
@@ -10,7 +10,8 @@
        <reference id="repository" interface="javax.jcr.Repository"\r
                filter="(cn=home)" />\r
        <reference id="userAdminService" interface="org.argeo.connect.UserAdminService" />\r
-\r
+       <reference id="nodeFileSystemProvider" interface="java.nio.file.spi.FileSystemProvider"\r
+               filter="(service.pid=org.argeo.node.fsProvider)" />\r
        <!-- Maintenance service -->\r
        <reference id="systemMaintenanceService" interface="org.argeo.connect.SystemMaintenanceService" />\r
        <!-- Generic DJ-ing app -->\r
@@ -21,4 +22,8 @@
        <reference id="peopleService" interface="org.argeo.people.PeopleService" />\r
        <reference id="trackerService" interface="org.argeo.tracker.TrackerService" />\r
        <reference id="documentsService" interface="org.argeo.documents.DocumentsService" />\r
+\r
+       <!-- Execute initialisation with a system authentication -->\r
+       <beans:bean\r
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />\r
 </beans:beans>\r

diff --git a/org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml b/org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml
index 963836d5ffd7686273a2a71a0d2c6a498fdaa01f..9f579b7ef9ca67a6a5e0002d8b17ea422b43771f 100644 (file)
--- a/org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml
+++ b/org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml
@@ -16,12 +16,12 @@
                <property name="bundleContext" ref="bundleContext" />
        </bean>
 
-       <bean name="app" class="org.argeo.cms.util.SimpleApp" abstract="true">
-               <property name="headerHeight" value="40" />
-               <property name="repository" ref="repository" />
-               <property name="bundleContext" ref="bundleContext" />
-               <property name="jcrBasePath" value="/public" /> 
-       </bean>
+<!--   <bean name="app" class="org.argeo.cms.util.SimpleApp" abstract="true"> -->
+<!--           <property name="headerHeight" value="40" /> -->
+<!--           <property name="repository" ref="repository" /> -->
+<!--           <property name="bundleContext" ref="bundleContext" /> -->
+<!--           <property name="jcrBasePath" value="/public" />  -->
+<!--   </bean> -->
 
        <bean id="header" class="org.argeo.cms.util.SimpleCmsHeader"
                abstract="true">
@@ -39,7 +39,7 @@
                        <list>
                                <bean p:label="Dashboard" p:target="/#" parent="menuLink" />
                                <bean p:label="Contacts" p:target="/#/people" parent="menuLink" />
-                               <bean p:label="Files" p:target="/#/sharedFiles" parent="menuLink" />
+                               <bean p:label="Files" p:target="/#/public" parent="menuLink" />
                        </list>
                </property>
                <property name="end" ref="headerEnd" />

diff --git a/org.argeo.suite.apps.web/META-INF/spring/ui-people.xml b/org.argeo.suite.apps.web/META-INF/spring/ui-people.xml
index b98be673c141605f673c87eede820851f179be09..6c9c3821058eac362f083a04bb4e65062295b4f6 100644 (file)
--- a/org.argeo.suite.apps.web/META-INF/spring/ui-people.xml
+++ b/org.argeo.suite.apps.web/META-INF/spring/ui-people.xml
@@ -9,7 +9,6 @@
        <bean id="people.mainPage" class="org.argeo.people.web.pages.PeopleDynamicPages">
                <property name="dynamicPages" ref="people.dynamicPages" />
                <property name="resourcesService" ref="resourcesService" />
-               <property name="activitiesService" ref="activitiesService" />
                <property name="peopleService" ref="peopleService" />
                <property name="iconPathes" ref="peopleEntityIcons" />
        </bean>
@@ -17,7 +16,7 @@
        <bean id="people.header" class="org.argeo.cms.util.SimpleCmsHeader">
                <property name="lead">
                        <list>
-                               <bean p:image="theme/argeo-classic/img/byArgeo.png" p:target="/people#"
+                               <bean p:image="theme/argeo-classic/img/logo-argeo.png" p:target="/people#"
                                        p:custom="cms_header-logo" parent="menuLink" />
                                <bean p:label="All" p:target="people!/search/all" parent="menuLink" />
                                <bean p:label="Persons" p:target="people!/search/persons"

diff --git a/org.argeo.suite.apps.web/META-INF/spring/ui.xml b/org.argeo.suite.apps.web/META-INF/spring/ui.xml
index 08f0c3f040b625814f8637be2eb78b9b9d60d601..e1963c139b74c2494a3794d18a936696eeb7e397 100644 (file)
--- a/org.argeo.suite.apps.web/META-INF/spring/ui.xml
+++ b/org.argeo.suite.apps.web/META-INF/spring/ui.xml
@@ -6,17 +6,23 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
        <!-- Main entry point for the CMS -->
-       <bean id="about" parent="app" init-method="init" destroy-method="destroy"
-               depends-on="systemMaintenanceService">
+       <bean name="app" class="org.argeo.cms.util.SimpleApp" init-method="init"
+               destroy-method="destroy">
+               <property name="headerHeight" value="40" />
+               <property name="repository" ref="repository" />
+               <property name="bundleContext" ref="bundleContext" />
+               <property name="jcrBasePath" value="/public" />
                <property name="workspace" value="main" />
                <property name="header" ref="headerManager" />
                <property name="pages">
                        <map>
                                <entry key="">
                                        <bean class="org.argeo.suite.web.DefaultMainPage">
-                                               <property name="peopleService" ref="peopleService" />
                                                <property name="peopleIconPaths" ref="peopleEntityIcons" />
                                                <property name="nodeFileSystemProvider" ref="nodeFileSystemProvider" />
+                                               <property name="resourcesService" ref="resourcesService" />
+                                               <property name="peopleService" ref="peopleService" />
+                                               <property name="suiteMaintenanceService" ref="systemMaintenanceService" />
                                        </bean>
                                </entry>
                                <entry key="people" value-ref="people.mainPage" />
@@ -84,4 +90,5 @@
                        </map>
                </property>
        </bean>
+
 </beans>

diff --git a/org.argeo.suite.apps.web/bnd.bnd b/org.argeo.suite.apps.web/bnd.bnd
index 1ec35c520a534505cb98242e321e3022adc97a13..d8a35880f8a6dae32e2d7565d20a087ef8f1d8f4 100644 (file)
--- a/org.argeo.suite.apps.web/bnd.bnd
+++ b/org.argeo.suite.apps.web/bnd.bnd
@@ -10,6 +10,7 @@ org.argeo.connect,\
 org.argeo.activities,\
 org.argeo.connect.resources,\
 org.argeo.connect.ui,\
+org.argeo.cms.spring,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
 org.argeo.util,\

diff --git a/sdk/argeo_suite_web.properties b/sdk/argeo_suite_web.properties
index 39edb1006cc8f9f861815b1edfaad83d75bc547e..fca449cae563a1655e2ab837e7470ff505891923 100644 (file)
--- a/sdk/argeo_suite_web.properties
+++ b/sdk/argeo_suite_web.properties
@@ -6,9 +6,9 @@ argeo.osgi.start.4.apps=org.eclipse.gemini.blueprint.extender
 argeo.osgi.start.5.workbench=org.eclipse.equinox.http.registry
 
 # WEB and RAP Workbench
-argeo.osgi.start.5.apps=org.argeo.suite.app
+argeo.osgi.start.5.apps=org.argeo.suite.apps
 
-argeo.osgi.start.6.apps=org.argeo.suite.web,\
+argeo.osgi.start.6.apps=org.argeo.suite.apps.web,\
 org.argeo.suite.workbench.rap
 
 ## Rap Workbench configuration