svn commit: r1622648 - in /openmeetings/trunk/singlewebapp: openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ openmeetings-install/src/main/java/org/apache/openmee...

[solomax]

Author: solomax
Date: Fri Sep  5 09:14:38 2014
New Revision: 1622648

URL: http://svn.apache.org/r1622648
Log:
Typos after renaming DB id are fixed

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
    
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1622648&r1=1622647&r2=1622648&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
 Fri Sep  5 09:14:38 2014
@@ -157,8 +157,7 @@ public class ConfigurationDao implements
                                query += " DESC";
                        }
 
-                       TypedQuery<Configuration> q = em.createQuery(query,
-                                       Configuration.class);
+                       TypedQuery<Configuration> q = em.createQuery(query, 
Configuration.class);
                        q.setFirstResult(start);
                        q.setMaxResults(max);
                        return q.getResultList();

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1622648&r1=1622647&r2=1622648&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
 Fri Sep  5 09:14:38 2014
@@ -48,8 +48,7 @@ import org.simpleframework.xml.Root;
                @NamedQuery(name = "getNondeletedConfiguration", query = 
"SELECT c FROM Configuration c  "
                                + "LEFT JOIN FETCH c.user WHERE c.deleted = 
false"),
                @NamedQuery(name = "getConfigurationById", query = "SELECT c 
FROM Configuration c "
-                               + "LEFT JOIN FETCH c.user "
-                               + "WHERE c.configuration_id = :configuration_id 
and c.deleted = false"),
+                               + "LEFT JOIN FETCH c.user WHERE c.id = 
:configuration_id and c.deleted = false"),
                @NamedQuery(name = "countConfigurations", query = "SELECT 
COUNT(c) FROM Configuration c WHERE c.deleted = false")
 })
 @Table(name = "configuration")

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1622648&r1=1622647&r2=1622648&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
 Fri Sep  5 09:14:38 2014
@@ -331,8 +331,7 @@ public class BackupExport {
                 * ##################### Config
                 */
                {
-                       List<Configuration> list = 
configurationDao.getConfigurations(
-                                       0, Integer.MAX_VALUE, 
"c.configuration_id", true);
+                       List<Configuration> list = 
configurationDao.getConfigurations(0, Integer.MAX_VALUE, "c.id", true);
                        Registry registry = new Registry();
                        registry.bind(State.class, StateConverter.class);
                        registry.bind(User.class, UserConverter.class);