From 4754e4ec30ef5c570f1a45b11c19e5df95ffb0e5 Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Tue, 7 Mar 2017 17:27:41 +0100
Subject: [PATCH] Remove legacy apps.properties files, clean spring config

---
 org.argeo.suite.app/.classpath                      |  1 -
 .../META-INF/spring/backend-services.xml            |  5 ++---
 .../META-INF/spring/maintenance-services.xml        |  8 +++-----
 .../META-INF/spring/workbench-services.xml          |  3 +--
 org.argeo.suite.app/apps.properties                 |  1 -
 org.argeo.suite.app/plugin.xml                      | 13 -------------
 .../theme/argeo-classic/people-classic.css          |  5 +++++
 org.argeo.suite.core/apps.properties                |  1 -
 org.argeo.suite.web/apps.properties                 |  1 -
 .../META-INF/spring/parts.xml                       |  1 -
 org.argeo.suite.workbench.rap/apps.properties       |  1 -
 .../suite/workbench/commands/ImportEntities.java    | 10 +++++-----
 12 files changed, 16 insertions(+), 34 deletions(-)
 delete mode 100644 org.argeo.suite.app/apps.properties
 delete mode 100644 org.argeo.suite.core/apps.properties
 delete mode 100644 org.argeo.suite.web/apps.properties
 delete mode 100644 org.argeo.suite.workbench.rap/apps.properties

diff --git a/org.argeo.suite.app/.classpath b/org.argeo.suite.app/.classpath
index 1ef7358..075009d 100644
--- a/org.argeo.suite.app/.classpath
+++ b/org.argeo.suite.app/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.argeo.suite.app/META-INF/spring/backend-services.xml b/org.argeo.suite.app/META-INF/spring/backend-services.xml
index e0c9d98..bae1034 100644
--- a/org.argeo.suite.app/META-INF/spring/backend-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/backend-services.xml
@@ -4,8 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-	<bean id="userAdminService" class="org.argeo.connect.core.UserAdminServiceImpl"
-		scope="singleton" lazy-init="false">
+	<bean id="userAdminService" class="org.argeo.connect.core.UserAdminServiceImpl">
 		<property name="userTransaction" ref="userTransaction" />
 		<property name="userAdmin" ref="userAdmin" />
 		<property name="userAdminServiceReference" ref="userAdmin" />
@@ -29,7 +28,7 @@
 
 	<bean id="documentsService" class="org.argeo.documents.DocumentsService" />
 
-	<!--order is important -->
+	<!-- order is important -->
 	<util:list id="knownAppServices">
 		<ref bean="peopleService" />
 		<ref bean="trackerService" />
diff --git a/org.argeo.suite.app/META-INF/spring/maintenance-services.xml b/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
index 42e9bad..2c0e515 100644
--- a/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
@@ -8,13 +8,11 @@
 	<bean id="resourcesMaintenanceService"
 		class="org.argeo.connect.resources.core.ResourcesMaintenanceService" />
 
-	<bean id="activitiesMaintenanceService"
-		class="org.argeo.activities.core.ActivitiesMaintenanceService" />
+	<bean id="activitiesMaintenanceService" class="org.argeo.activities.core.ActivitiesMaintenanceService" />
 
 	<bean id="peopleMaintenanceService" class="org.argeo.people.core.PeopleMaintenanceService" />
 
-	<bean id="trackerMaintenanceService"
-		class="org.argeo.tracker.core.TrackerMaintenanceService" />
+	<bean id="trackerMaintenanceService" class="org.argeo.tracker.core.TrackerMaintenanceService" />
 
 	<!-- There is no maintenance Service for the Documents App yet -->
 	<!-- Order is important -->
@@ -33,7 +31,7 @@
 		<property name="maintenanceServices" ref="knownMaintenanceServices" />
 	</bean>
 
-	<!-- Execute initialization with a system authentication -->
+	<!-- Execute initialisation with a system authentication -->
 	<bean
 		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />
 </beans>
diff --git a/org.argeo.suite.app/META-INF/spring/workbench-services.xml b/org.argeo.suite.app/META-INF/spring/workbench-services.xml
index 19f1bf8..86b14b8 100644
--- a/org.argeo.suite.app/META-INF/spring/workbench-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/workbench-services.xml
@@ -29,8 +29,7 @@
 	</bean>
 
 
-	<!-- Execute initialization with a system authentication -->
+	<!-- Execute initialisation with a system authentication -->
 	<bean
 		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />
-
 </beans>
diff --git a/org.argeo.suite.app/apps.properties b/org.argeo.suite.app/apps.properties
deleted file mode 100644
index e0227a3..0000000
--- a/org.argeo.suite.app/apps.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.security.systemKey=argeo
\ No newline at end of file
diff --git a/org.argeo.suite.app/plugin.xml b/org.argeo.suite.app/plugin.xml
index 23b4993..01657b7 100644
--- a/org.argeo.suite.app/plugin.xml
+++ b/org.argeo.suite.app/plugin.xml
@@ -66,19 +66,6 @@
                alias="/ui/suite/img/logo-argeo.png"  
                base-name="theme/argeo-classic/img/logo-argeo.png">  
          </resource>  
-         <!-- javascript libraries -->
-         <!--          <resource  
-               alias="/ui/suite/js/Chart.min.js"  
-               base-name="js/Chart.min.js">  
-         </resource>  
-         <resource  
-               alias="/ui/suite/js/leaflet.js"  
-               base-name="js/leaflet.js">  
-         </resource>  
-         <resource  
-               alias="/ui/suite/js/leaflet.css"  
-               base-name="js/leaflet.css">  
-         </resource>   -->
     </extension>  
 	
 	<extension
diff --git a/org.argeo.suite.app/theme/argeo-classic/people-classic.css b/org.argeo.suite.app/theme/argeo-classic/people-classic.css
index 982f31e..4614fa1 100644
--- a/org.argeo.suite.app/theme/argeo-classic/people-classic.css
+++ b/org.argeo.suite.app/theme/argeo-classic/people-classic.css
@@ -59,6 +59,11 @@
 	border: none;
 }
 
+.people_icon_twitter {
+	background-image: url(theme/argeo-classic/icons/people/contacts/twitter.png);
+	border: none;
+}
+
 .people_icon_linkedin {
 	background-image: url(theme/argeo-classic/icons/people/contacts/linkedin.png);
 	border: none;
diff --git a/org.argeo.suite.core/apps.properties b/org.argeo.suite.core/apps.properties
deleted file mode 100644
index e0227a3..0000000
--- a/org.argeo.suite.core/apps.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.security.systemKey=argeo
\ No newline at end of file
diff --git a/org.argeo.suite.web/apps.properties b/org.argeo.suite.web/apps.properties
deleted file mode 100644
index e0227a3..0000000
--- a/org.argeo.suite.web/apps.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.security.systemKey=argeo
\ No newline at end of file
diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml
index 40b1997..5903b42 100644
--- a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml
+++ b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml
@@ -6,7 +6,6 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<!-- COMMANDS -->
-
 	<bean id="importEntities" class="org.argeo.suite.workbench.commands.ImportEntities"
 		scope="prototype">
 		<property name="repository" ref="repository" />
diff --git a/org.argeo.suite.workbench.rap/apps.properties b/org.argeo.suite.workbench.rap/apps.properties
deleted file mode 100644
index e0227a3..0000000
--- a/org.argeo.suite.workbench.rap/apps.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.security.systemKey=argeo
\ No newline at end of file
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
index 293cfe0..4febb0e 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
@@ -82,8 +82,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 	}
 
 	// TODO make this configurable
-	private final static String IMPORT_ENCODING = "ISO-8859-1";//"UTF-8";
-	
+	private final static String IMPORT_ENCODING = "ISO-8859-1";// "UTF-8";
 
 	/* DEPENDENCY INJECTION */
 	private Repository repository;
@@ -131,7 +130,8 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 		@Override
 		public boolean performFinish() {
 			// Session session = null;
-			// String templateName = resourceTypeCombo.getItem(resourceTypeCombo.getSelectionIndex());
+			// String templateName =
+			// resourceTypeCombo.getItem(resourceTypeCombo.getSelectionIndex());
 			// String type = KNOWN_TEMPLATES.get(templateName);
 			importDefaultOrgFile(file);
 			return true;
@@ -447,8 +447,8 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 							stStr, cStr, true, null, ContactValueCatalogs.CONTACT_CAT_MAIN, null);
 				String mobileStr = getStringValue(sheet, mobileIndex, i);
 				if (notEmpty(mobileStr))
-					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, mobileStr, true, null,
-							ContactValueCatalogs.CONTACT_CAT_MOBILE, null);
+					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, mobileStr, true, null, null,
+							null);
 				String phoneStr = getStringValue(sheet, telephoneNumberIndex, i);
 				if (notEmpty(phoneStr))
 					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, phoneStr, true, null,
-- 
2.30.2