Author: sebawagner
Date: Sun May 20 08:46:09 2012
New Revision: 1340642
URL: http://svn.apache.org/viewvc?rev=1340642&view=rev
Log:
Add libraries to classpath needed for Eclipse
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1340642&r1=1340641&r2=1340642&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Sun May 20 08:46:09
2012
@@ -126,5 +126,24 @@
<classpathentry kind="lib"
path="build/lib/mainlibs/org.springframework.orm-jar-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/lib/mainlibs/org.springframework.transaction-jar-3.1.1.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/lib/mainlibs/org.springframework.web.servlet-jar-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.aopalliance-1.0.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.net.sf.cglib-2.2.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.antlr-3.1.3.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.slf4j.api-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/com.springsource.slf4j.bridge-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-aop-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-asm-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-beans-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-context-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-context-support-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-core-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-expression-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/lib/spring-web-3.1.1.RELEASE.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java?rev=1340642&r1=1340641&r2=1340642&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
Sun May 20 08:46:09 2012
@@ -30,10 +30,6 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.beans.basic.SearchResult;
@@ -492,13 +488,13 @@ public class Fieldmanagment {
}
public SearchResult<Fieldvalues> getFieldsByLanguage(int start, int
max, String orderby,
- boolean asc, Long language_id) {
+ boolean asc, Long language_id, String search) {
try {
SearchResult<Fieldvalues> sresult = new
SearchResult<Fieldvalues>();
sresult.setObjectName(Fieldlanguagesvalues.class.getName());
- sresult.setRecords(this.selectMaxFromFieldsValues());
+
sresult.setRecords(this.selectMaxFromFieldsValues(search));
sresult.setResult(this.getMixedFieldValuesList(start,
max, orderby,
- asc, language_id));
+ asc, language_id, search));
return sresult;
} catch (Exception ex2) {
log.error("[getFieldsByLanguage]: ", ex2);
@@ -506,17 +502,20 @@ public class Fieldmanagment {
return null;
}
- private Long selectMaxFromFieldsValues() throws Exception {
+ private Long selectMaxFromFieldsValues(String search) throws Exception {
+ String queryLanguage = "select count(c.fieldvalues_id) from
Fieldvalues c where c.deleted = 'false'";
+ if (search.length()>0) {
+ queryLanguage += " WHERE c.name LIKE %"+search+"% " +
+ "OR c.fieldvalues_id =
"+search;
+ }
TypedQuery<Long> query = em
- .createQuery("select max(c.fieldvalues_id) from
Fieldvalues c where c.deleted = 'false'", Long.class);
- List<Long> ll = query.getResultList();
- // log.error((Long)ll.get(0));
- return ll.get(0);
+ .createQuery(queryLanguage, Long.class);
+ return query.getResultList().get(0);
}
private List<Fieldvalues> getMixedFieldValuesList(int start, int max,
- String orderby, boolean asc, Long language_id) throws
Exception {
- List<Fieldvalues> ll = this.getFieldsValues(start, max,
orderby, asc);
+ String orderby, boolean asc, Long language_id, String
search) throws Exception {
+ List<Fieldvalues> ll = this.getFieldsValues(start, max,
orderby, asc, search);
for (Iterator<Fieldvalues> iter = ll.iterator();
iter.hasNext();) {
Fieldvalues fv = iter.next();
fv.setFieldlanguagesvalue(this.getFieldByIdAndLanguage(
@@ -526,34 +525,27 @@ public class Fieldmanagment {
}
private List<Fieldvalues> getFieldsValues() throws Exception {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Fieldvalues> cq =
cb.createQuery(Fieldvalues.class);
- Root<Fieldvalues> c = cq.from(Fieldvalues.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
- cq.where(condition);
- TypedQuery<Fieldvalues> q = em.createQuery(cq);
- List<Fieldvalues> ll = q.getResultList();
- return ll;
+ return em.createNamedQuery("getFieldvaluesByLanguage",
Fieldvalues.class)
+ .getResultList();
}
private List<Fieldvalues> getFieldsValues(int start, int max,
- String orderby, boolean asc) throws Exception {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Fieldvalues> cq =
cb.createQuery(Fieldvalues.class);
- Root<Fieldvalues> c = cq.from(Fieldvalues.class);
- Predicate condition = cb.equal(c.get("deleted"), "false");
- cq.where(condition);
- cq.distinct(asc);
+ String orderby, boolean asc, String search) throws
Exception {
+ String queryLanguage = "select c.fieldvalues_id from
Fieldvalues c where c.deleted = 'false'";
+ if (search.length()>0) {
+ queryLanguage += " WHERE c.name LIKE %"+search+"% " +
+ "OR c.fieldvalues_id =
"+search;
+ }
if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
+ queryLanguage += " ORDER BY "+orderby+ " ASC";
} else {
- cq.orderBy(cb.desc(c.get(orderby)));
+ queryLanguage += " ORDER BY "+orderby + "DESC";
}
- TypedQuery<Fieldvalues> q = em.createQuery(cq);
+ TypedQuery<Fieldvalues> q = em
+ .createQuery(queryLanguage, Fieldvalues.class);
q.setFirstResult(start);
q.setMaxResults(max);
- List<Fieldvalues> ll = q.getResultList();
- return ll;
+ return q.getResultList();
}
public Fieldvalues getFieldvaluesById(Long fieldvalues_id) {
