Remove legacy apps.properties files, clean spring config

diff --git a/org.argeo.suite.app/.classpath b/org.argeo.suite.app/.classpath
index 1ef73588ae7ce103e0875a262ce64dd78395eedd..075009d77450ff8bc131fb1e4741fc35e5e6fd72 100644 (file)
--- 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 e0c9d98f2179052c3f60a945a709f84cc549ca8d..bae10344d3e25d2b2795b8c3c2f0bc7dcd3c6c8f 100644 (file)
--- 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\r
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">\r
 \r
-       <bean id="userAdminService" class="org.argeo.connect.core.UserAdminServiceImpl"\r
-               scope="singleton" lazy-init="false">\r
+       <bean id="userAdminService" class="org.argeo.connect.core.UserAdminServiceImpl">\r
                <property name="userTransaction" ref="userTransaction" />\r
                <property name="userAdmin" ref="userAdmin" />\r
                <property name="userAdminServiceReference" ref="userAdmin" />\r
@@ -29,7 +28,7 @@
 \r
        <bean id="documentsService" class="org.argeo.documents.DocumentsService" />\r
 \r
-       <!--order is important -->\r
+       <!-- order is important -->\r
        <util:list id="knownAppServices">\r
                <ref bean="peopleService" />\r
                <ref bean="trackerService" />\r

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 42e9bad1a1fc826ecd85d04a0badb5dd9e92b4b2..2c0e5151911f57f5b9eb5d743eee83f73e476b55 100644 (file)
--- 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"\r
                class="org.argeo.connect.resources.core.ResourcesMaintenanceService" />\r
 \r
-       <bean id="activitiesMaintenanceService"\r
-               class="org.argeo.activities.core.ActivitiesMaintenanceService" />\r
+       <bean id="activitiesMaintenanceService" class="org.argeo.activities.core.ActivitiesMaintenanceService" />\r
 \r
        <bean id="peopleMaintenanceService" class="org.argeo.people.core.PeopleMaintenanceService" />\r
 \r
-       <bean id="trackerMaintenanceService"\r
-               class="org.argeo.tracker.core.TrackerMaintenanceService" />\r
+       <bean id="trackerMaintenanceService" class="org.argeo.tracker.core.TrackerMaintenanceService" />\r
 \r
        <!-- There is no maintenance Service for the Documents App yet -->\r
        <!-- Order is important -->\r
@@ -33,7 +31,7 @@
                <property name="maintenanceServices" ref="knownMaintenanceServices" />\r
        </bean>\r
 \r
-       <!-- Execute initialization with a system authentication -->\r
+       <!-- Execute initialisation with a system authentication -->\r
        <bean\r
                class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />\r
 </beans>\r

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 19f1bf8e5823bbf0c1d4cd5e122fbc1b9299ec6d..86b14b8d612557b8f6568466780dae7edb0d2100 100644 (file)
--- 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>\r
 \r
 \r
-       <!-- Execute initialization with a system authentication -->\r
+       <!-- Execute initialisation with a system authentication -->\r
        <bean\r
                class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />\r
-\r
 </beans>\r

diff --git a/org.argeo.suite.app/apps.properties b/org.argeo.suite.app/apps.properties
deleted file mode 100644 (file)
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 23b499361fc0731cf0518e11783656910b441427..01657b7ab2d8a9bbcd0d6b3d8b17c047f5fa844d 100644 (file)
--- 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 982f31ed741c1f3f8dce1406d7ff5c4d046397c2..4614fa14cea09bc429a6438710ee9d558a115ad4 100644 (file)
--- 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 (file)
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 (file)
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 40b1997a958fb8888c194bf77074d5dd7c3cad91..5903b42b4a966f2ecebb32bfc6ec89178279fe55 100644 (file)
--- 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 (file)
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 293cfe06273f7a0afb375b53fa29ae28b3ed967c..4febb0eccb357a7631ecea6a272671493b4d9c2d 100644 (file)
--- 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,