From 2185b49de9667527088fc875d74b628eebbd8535 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Aug 2017 17:45:52 +0200
Subject: [PATCH] Activate web UI

---
 org.argeo.suite.apps.web/META-INF/spring/osgi.xml  |  7 ++++++-
 .../META-INF/spring/ui-commons.xml                 | 14 +++++++-------
 .../META-INF/spring/ui-people.xml                  |  3 +--
 org.argeo.suite.apps.web/META-INF/spring/ui.xml    | 13 ++++++++++---
 org.argeo.suite.apps.web/bnd.bnd                   |  1 +
 sdk/argeo_suite_web.properties                     |  4 ++--
 6 files changed, 27 insertions(+), 15 deletions(-)

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 1eb932d..2ef3e0d 100644
--- 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"
 		filter="(cn=home)" />
 	<reference id="userAdminService" interface="org.argeo.connect.UserAdminService" />
-
+	<reference id="nodeFileSystemProvider" interface="java.nio.file.spi.FileSystemProvider"
+		filter="(service.pid=org.argeo.node.fsProvider)" />
 	<!-- Maintenance service -->
 	<reference id="systemMaintenanceService" interface="org.argeo.connect.SystemMaintenanceService" />
 	<!-- Generic DJ-ing app -->
@@ -21,4 +22,8 @@
 	<reference id="peopleService" interface="org.argeo.people.PeopleService" />
 	<reference id="trackerService" interface="org.argeo.tracker.TrackerService" />
 	<reference id="documentsService" interface="org.argeo.documents.DocumentsService" />
+
+	<!-- Execute initialisation with a system authentication -->
+	<beans:bean
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />
 </beans:beans>
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 963836d..9f579b7 100644
--- 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 b98be67..6c9c382 100644
--- 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 08f0c3f..e1963c1 100644
--- 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 1ec35c5..d8a3588 100644
--- 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 39edb10..fca449c 100644
--- 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
-- 
2.30.2