svn commit: r1332524 - /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java

[solomax]

Author: solomax
Date: Tue May  1 05:10:31 2012
New Revision: 1332524

URL: http://svn.apache.org/viewvc?rev=1332524&view=rev
Log:
OPENMEETINGS-111 check if installation is not necessary is added.

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1332524&r1=1332523&r2=1332524&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
 Tue May  1 05:10:31 2012
@@ -44,6 +44,7 @@ import org.openmeetings.app.data.user.Or
 import org.openmeetings.app.data.user.Salutationmanagement;
 import org.openmeetings.app.data.user.Statemanagement;
 import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.data.user.dao.UsersDaoImpl;
 import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
 import org.openmeetings.utils.ImportHelper;
 import org.red5.logging.Red5LoggerFactory;
@@ -66,6 +67,8 @@ public class ImportInitvalues {
        @Autowired
        private Usermanagement userManagement;
        @Autowired
+       private UsersDaoImpl usersDao;
+       @Autowired
        private Fieldmanagment fieldmanagment;
        @Autowired
        private FieldLanguageDaoImpl fieldLanguageDaoImpl;
@@ -989,7 +992,11 @@ public class ImportInitvalues {
        
        public void loadAll(String filePath, InstallationConfig cfg, String 
username,
                        String userpass, String useremail, String groupame, 
String timeZone) throws Exception {
-               
+               //FIXME dummy check if installation was performed before
+               if(usersDao.getAllUsers().size() > 0) {
+                       log.debug("System contains users, no need to install 
data one more time.");
+                       return;
+               }
                loadSystem(filePath, cfg);
                loadInitUserAndOrganisation(username,
                                userpass, useremail, groupame, timeZone, 
cfg.defaultLangId);