Author: sebawagner
Date: Sat Jul 7 08:19:21 2012
New Revision: 1358521
URL: http://svn.apache.org/viewvc?rev=1358521&view=rev
Log:
Merge r1356053 to 2.0 branch
Added:
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResultUsers.java
Modified:
incubator/openmeetings/branches/2.0/build.xml
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResult.java
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/conference/Roommanagement.java
Modified: incubator/openmeetings/branches/2.0/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/build.xml?rev=1358521&r1=1358520&r2=1358521&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/build.xml (original)
+++ incubator/openmeetings/branches/2.0/build.xml Sat Jul 7 08:19:21 2012
@@ -743,10 +743,6 @@
<ivy:retrieve conf="${ivy.conf.name}"
pattern="${ivy.lib.location}/[artifact]-[type]-[revision].[ext]" />
</target>
- <!-- wrapper to load the server before the client to have the
- red5.jar that is necessary to build the client -->
- <target name="-retrieve-red5" depends="-retrieve-red5-client" />
-
<!-- Check for the Red5 libraries -->
<target name="-retrieve-red5-server" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task">
<svn refid="svn.settings">
@@ -800,7 +796,7 @@
</target>
<!-- Check for the Top level libraries -->
- <target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5">
+ <target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-client">
<!-- Ivy configuration -
http://ant.apache.org/ivy/history/trunk/ant.html -->
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="mainlib" />
Modified:
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResult.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResult.java?rev=1358521&r1=1358520&r2=1358521&view=diff
==============================================================================
---
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResult.java
(original)
+++
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResult.java
Sat Jul 7 08:19:21 2012
@@ -18,10 +18,11 @@
*/
package org.openmeetings.app.data.beans.basic;
+import java.io.Serializable;
import java.util.List;
-public class SearchResult<T> {
-
+public class SearchResult<T> implements Serializable {
+ private static final long serialVersionUID = -2428450774121690218L;
private String objectName;
private Long records;
private List<T> result;
@@ -51,5 +52,4 @@ public class SearchResult<T> {
public void setErrorId(Long errorId) {
this.errorId = errorId;
}
-
}
Added:
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResultUsers.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResultUsers.java?rev=1358521&view=auto
==============================================================================
---
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResultUsers.java
(added)
+++
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/beans/basic/SearchResultUsers.java
Sat Jul 7 08:19:21 2012
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.openmeetings.app.data.beans.basic;
+
+import org.openmeetings.app.persistence.beans.user.Users;
+
+public class SearchResultUsers extends SearchResult<Users> {
+ private static final long serialVersionUID = -2428450774121690218L;
+}
Modified:
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/conference/Roommanagement.java?rev=1358521&r1=1358520&r2=1358521&view=diff
==============================================================================
---
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/data/conference/Roommanagement.java
Sat Jul 7 08:19:21 2012
@@ -498,15 +498,15 @@ public class Roommanagement {
} else {
search = "%" + search + "%";
}
-
- hql += " ORDER BY " + orderby;
-
- if (asc) {
- hql += " ASC";
- } else {
- hql += " DESC";
+ if (orderby != null) {
+ hql += " ORDER BY " + (orderby.startsWith("c.")
? "" : "c.") + orderby;
+
+ if (asc) {
+ hql += " ASC";
+ } else {
+ hql += " DESC";
+ }
}
-
TypedQuery<Rooms> query = em.createQuery(hql,
Rooms.class);
query.setParameter("search", search);
query.setFirstResult(start);
