Author: solomax
Date: Thu Sep 13 07:12:13 2012
New Revision: 1384221
URL: http://svn.apache.org/viewvc?rev=1384221&view=rev
Log:
Wicket generalization: General DAO interface was created to act in DataProviders
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/crypt/ManageCryptStyle.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Thu Sep 13 07:12:13 2012
@@ -44,7 +44,7 @@
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven />
- <tx:annotation-driven transaction-manager="jpaTransactionManager" />
+ <tx:annotation-driven transaction-manager="jpaTransactionManager"
proxy-target-class="true"/>
<context:annotation-config />
<context:component-scan base-package="org.apache.openmeetings" />
@@ -186,6 +186,7 @@
<bean id="omTimeZoneDaoImpl"
class="org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl" />
<bean id="statemanagement"
class="org.apache.openmeetings.data.user.Statemanagement" />
<bean id="fieldLanguageDaoImpl"
class="org.apache.openmeetings.data.basic.FieldLanguageDaoImpl" />
+ <bean id="fieldLanguagesValuesDAO"
class="org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO" />
<bean id="fieldmanagment"
class="org.apache.openmeetings.data.basic.Fieldmanagment" />
<bean id="cfgManagement"
class="org.apache.openmeetings.data.basic.Configurationmanagement" />
<bean id="appointmentDao"
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java?rev=1384221&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
Thu Sep 13 07:12:13 2012
@@ -0,0 +1,31 @@
+/*
+ * 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.apache.openmeetings.data;
+
+import java.util.List;
+
+import org.apache.openmeetings.persistence.beans.OmEntity;
+
+public interface OmDAO<T extends OmEntity> {
+ T get(long id);
+ List<T> get(int start, int count);
+ long count();
+ void update(T entity);
+ void delete(T entity);
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Configurationmanagement.java
Thu Sep 13 07:12:13 2012
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
+import javax.annotation.Resource;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
@@ -34,6 +35,7 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.OmDAO;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
@@ -45,7 +47,7 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class Configurationmanagement {
+public class Configurationmanagement implements OmDAO<Configuration>{
private static final Logger log = Red5LoggerFactory.getLogger(
Configurationmanagement.class,
@@ -56,7 +58,7 @@ public class Configurationmanagement {
@PersistenceContext
private EntityManager em;
- @Autowired
+ @Resource(name = "usersDao")
private UsersDaoImpl usersDao;
@Autowired
private AuthLevelmanagement authLevelManagement;
@@ -371,4 +373,27 @@ public class Configurationmanagement {
q.setMaxResults(count);
return q.getResultList();
}
+
+ public Configuration get(long id) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Configuration> get(int start, int count) {
+ return getNondeletedConfiguration(start, count);
+ }
+
+ public long count() {
+ return selectMaxFromConfigurations();
+ }
+
+ public void update(Configuration entity) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void delete(Configuration entity) {
+ // TODO Auto-generated method stub
+
+ }
}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java?rev=1384221&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDAO.java
Thu Sep 13 07:12:13 2012
@@ -0,0 +1,79 @@
+/*
+ * 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.apache.openmeetings.data.basic;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.apache.openmeetings.data.OmDAO;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class FieldLanguagesValuesDAO implements OmDAO<Fieldlanguagesvalues> {
+ @PersistenceContext
+ private EntityManager em;
+ @Autowired
+ private Configurationmanagement cfgManagement;
+
+ public List<Fieldlanguagesvalues> get(int first, int count) {
+ return get(cfgManagement.getConfValue("default_lang_id",
Long.class, "1"), first, count);
+ }
+
+ public List<Fieldlanguagesvalues> get(Long language_id, int first, int
count) {
+ // all Fieldlanguagesvalues in current Language
+ TypedQuery<Fieldlanguagesvalues> q =
em.createNamedQuery("allFieldLanguageValues", Fieldlanguagesvalues.class);
+ q.setParameter("language_id", language_id);
+ q.setFirstResult(first);
+ q.setMaxResults(count);
+ return q.getResultList();
+ }
+
+ public Fieldlanguagesvalues get(long id) {
+ TypedQuery<Fieldlanguagesvalues> q =
em.createNamedQuery("getFieldLanguagesValuesById", Fieldlanguagesvalues.class);
+ q.setParameter("id", id);
+ Fieldlanguagesvalues flv = null;
+ try {
+ flv = q.getSingleResult();
+ } catch (NoResultException e) {
+
+ }
+ return flv;
+ }
+
+ public long count() {
+ TypedQuery<Long> q = em.createNamedQuery("getFieldCount",
Long.class);
+ return q.getSingleResult();
+ }
+
+ public void update(Fieldlanguagesvalues entity) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void delete(Fieldlanguagesvalues entity) {
+ // TODO Auto-generated method stub
+
+ }
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/Fieldmanagment.java
Thu Sep 13 07:12:13 2012
@@ -59,6 +59,9 @@ public class Fieldmanagment {
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
@Autowired
+ private FieldLanguagesValuesDAO fieldLanguagesValuesDAO;
+
+ @Autowired
private Configurationmanagement cfgManagement;
// Reflect the Reverse Order!!
@@ -381,15 +384,6 @@ public class Fieldmanagment {
return q.getResultList();
}
- public List<Fieldlanguagesvalues> getMixedFieldValuesList(Long
language_id, int first, int count) {
- // all Fieldlanguagesvalues in current Language
- TypedQuery<Fieldlanguagesvalues> q =
em.createNamedQuery("allFieldLanguageValues", Fieldlanguagesvalues.class);
- q.setParameter("language_id", language_id);
- q.setFirstResult(first);
- q.setMaxResults(count);
- return q.getResultList();
- }
-
public List<Fieldlanguagesvalues> getUntranslatedFieldValuesList(Long
language_id) {
// all FieldValuesIds in current Language
TypedQuery<Long> q0 = em.createNamedQuery("allFieldValuesIds",
Long.class);
@@ -473,8 +467,7 @@ public class Fieldmanagment {
}
public long getNextFieldvaluesId() {
- TypedQuery<Long> q = em.createNamedQuery("getFieldCount",
Long.class);
- return q.getSingleResult() + 1;
+ return fieldLanguagesValuesDAO.count() + 1;
}
public Long addFieldAndLabel(String name, String value, Long
language_id) {
@@ -580,15 +573,7 @@ public class Fieldmanagment {
private Fieldlanguagesvalues getFieldlanguagesvaluesById(
Long fieldlanguagesvalues_id) throws Exception {
- String hql = "select f from Fieldlanguagesvalues f WHERE
f.fieldlanguagesvalues_id = :fieldlanguagesvalues_id ";
- TypedQuery<Fieldlanguagesvalues> query = em.createQuery(hql,
Fieldlanguagesvalues.class);
- query.setParameter("fieldlanguagesvalues_id",
fieldlanguagesvalues_id);
- Fieldlanguagesvalues flv = null;
- try {
- flv = performReplace(query.getSingleResult());
- } catch (NoResultException ex) {
- }
- return flv;
+ return
performReplace(fieldLanguagesValuesDAO.get(fieldlanguagesvalues_id));
}
private Fieldlanguagesvalues performReplace(Fieldlanguagesvalues f) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
Thu Sep 13 07:12:13 2012
@@ -31,6 +31,7 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.OmDAO;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.red5.logging.Red5LoggerFactory;
@@ -39,7 +40,7 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class LdapConfigDaoImpl {
+public class LdapConfigDaoImpl implements OmDAO<LdapConfig> {
private static final Logger log =
Red5LoggerFactory.getLogger(LdapConfigDaoImpl.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
@@ -266,5 +267,33 @@ public class LdapConfigDaoImpl {
q.setMaxResults(count);
return q.getResultList();
}
+
+
+ public LdapConfig get(long id) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ public List<LdapConfig> get(int start, int count) {
+ return getNondeletedLdapConfig(start, count);
+ }
+
+
+ public long count() {
+ return selectMaxFromLdapConfig();
+ }
+
+
+ public void update(LdapConfig entity) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ public void delete(LdapConfig entity) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
Thu Sep 13 07:12:13 2012
@@ -32,6 +32,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.OmDAO;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -41,7 +42,7 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class UsersDaoImpl {
+public class UsersDaoImpl implements OmDAO<Users> {
private static final Logger log =
Red5LoggerFactory.getLogger(UsersDaoImpl.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
@@ -49,6 +50,26 @@ public class UsersDaoImpl {
@Autowired
private ManageCryptStyle manageCryptStyle;
+ public Users get(long id) {
+ return getUser(id);
+ }
+
+ public List<Users> get(int first, int count) {
+ return getNondeletedUsers((int)first, (int)count);
+ }
+
+ public long count() {
+ return selectMaxFromUsers();
+ }
+
+ public void update(Users u) {
+ updateUser(u);
+ }
+
+ public void delete(Users u) {
+ deleteUserID(u.getUser_id());
+ }
+
/**
*
* @param user_id
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
Thu Sep 13 07:12:13 2012
@@ -32,6 +32,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openmeetings.persistence.beans.OmEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -44,7 +45,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "configuration")
@Root(name="config")
-public class Configuration implements Serializable {
+public class Configuration implements Serializable, OmEntity {
private static final long serialVersionUID = -6129473946508963339L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
Thu Sep 13 07:12:13 2012
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.persistence.beans.OmEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -43,7 +44,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
-public class LdapConfig implements Serializable {
+public class LdapConfig implements Serializable, OmEntity {
private static final long serialVersionUID = 2839158519803993035L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
Thu Sep 13 07:12:13 2012
@@ -52,6 +52,8 @@ import org.apache.openmeetings.persisten
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = 1 AND flv.fieldvalues_id
NOT IN (:id_list)")
+ , @NamedQuery(name="getFieldLanguagesValuesById"
+ , query = "SELECT f FROM Fieldlanguagesvalues f WHERE
f.fieldlanguagesvalues_id = :id")
})
@Table(name = "fieldlanguagesvalues")
public class Fieldlanguagesvalues implements Serializable, OmEntity {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/crypt/ManageCryptStyle.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/crypt/ManageCryptStyle.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/crypt/ManageCryptStyle.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/crypt/ManageCryptStyle.java
Thu Sep 13 07:12:13 2012
@@ -19,7 +19,6 @@
package org.apache.openmeetings.utils.crypt;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -29,8 +28,6 @@ public class ManageCryptStyle {
private static final Logger log = Red5LoggerFactory.getLogger(
ManageCryptStyle.class,
OpenmeetingsVariables.webAppRootKey);
- @Autowired
- private Configurationmanagement cfgManagement;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@@ -40,10 +37,6 @@ public class ManageCryptStyle {
log.debug("getInstanceOfCrypt: " + this);
- log.debug("getInstanceOfCrypt: " + cfgManagement);
-
- // String configKeyCryptClassName =
- //
"org.apache.openmeetings.utils.crypt.MD5Implementation";
String configKeyCryptClassName = scopeApplicationAdapter
.getCryptKey();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
Thu Sep 13 07:12:13 2012
@@ -25,7 +25,7 @@
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
- <table>
+ <table wicket:id="confListContainer">
<tr>
<th><wicket:ommessage
key="264" /></th>
<th><wicket:ommessage
key="265" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Thu Sep 13 07:12:13 2012
@@ -18,21 +18,17 @@
*/
package org.apache.openmeetings.web.components.admin.configurations;
-import java.util.Iterator;
-
import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
public class ConfigsPanel extends AdminPanel {
@@ -41,26 +37,8 @@ public class ConfigsPanel extends AdminP
public ConfigsPanel(String id) {
super(id);
- DataView<Configuration> dataView = new
DataView<Configuration>("configList", new IDataProvider<Configuration>(){
- private static final long serialVersionUID = -1L;
-
- public void detach() {
- //empty
- }
-
- public Iterator<? extends Configuration> iterator(long
first, long count) {
- return
Application.getBean(Configurationmanagement.class).getNondeletedConfiguration((int)first,
(int)count).iterator();
- }
-
- public long size() {
- return
Application.getBean(Configurationmanagement.class).selectMaxFromConfigurations();
- }
-
- public IModel<Configuration> model(Configuration
object) {
- return new
CompoundPropertyModel<Configuration>(object);
- }
-
- }) {
+ DataView<Configuration> dataView = new
DataView<Configuration>("configList"
+ , new
OmDataProvider<Configuration>(Configurationmanagement.class)) {
private static final long serialVersionUID =
8715559628755439596L;
@Override
@@ -79,9 +57,16 @@ public class ConfigsPanel extends AdminP
});
}
};
- dataView.setItemsPerPage(8); //FIXME need to be parametrized
- add(dataView);
- add(new AjaxPagingNavigator("navigator", dataView));
+ final WebMarkupContainer confListContainer = new
WebMarkupContainer("confListContainer");
+ add(confListContainer.add(dataView).setOutputMarkupId(true));
+ add(new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID =
5097048616003411362L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(confListContainer);
+ }
+ });
Configuration configuration = new Configuration();
form = new ConfigForm("form", configuration);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Thu Sep 13 07:12:13 2012
@@ -20,19 +20,17 @@ package org.apache.openmeetings.web.comp
import java.util.Iterator;
-import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
public class LangPanel extends AdminPanel {
private static final long serialVersionUID = 5904180813198016592L;
@@ -41,25 +39,13 @@ public class LangPanel extends AdminPane
public LangPanel(String id) {
super(id);
- DataView<Fieldlanguagesvalues> dataView = new
DataView<Fieldlanguagesvalues>("langList", new
IDataProvider<Fieldlanguagesvalues>(){
+ DataView<Fieldlanguagesvalues> dataView = new
DataView<Fieldlanguagesvalues>("langList"
+ , new
OmDataProvider<Fieldlanguagesvalues>(FieldLanguagesValuesDAO.class){
private static final long serialVersionUID =
-6822789354860988626L;
- public void detach() {
- //empty
- }
-
public Iterator<? extends Fieldlanguagesvalues>
iterator(long first, long count) {
- return
Application.getBean(Fieldmanagment.class).getMixedFieldValuesList(language,
(int)first, (int)count).iterator();
- }
-
- public long size() {
- return
Application.getBean(Fieldmanagment.class).getNextFieldvaluesId() - 1; //FIXME
need to be generalized
- }
-
- public IModel<Fieldlanguagesvalues>
model(Fieldlanguagesvalues object) {
- return new
CompoundPropertyModel<Fieldlanguagesvalues>(object);
+ return
Application.getBean(FieldLanguagesValuesDAO.class).get(language, (int)first,
(int)count).iterator();
}
-
}) {
private static final long serialVersionUID =
8715559628755439596L;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
Thu Sep 13 07:12:13 2012
@@ -25,7 +25,7 @@
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
- <table>
+ <table wicket:id="ldapListContainer">
<tr>
<th><wicket:ommessage
key="1104" /></th>
<th><wicket:ommessage
key="1105" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
Thu Sep 13 07:12:13 2012
@@ -18,21 +18,17 @@
*/
package org.apache.openmeetings.web.components.admin.ldaps;
-import java.util.Iterator;
-
import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
+import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
public class LdapsPanel extends AdminPanel {
@@ -41,26 +37,8 @@ public class LdapsPanel extends AdminPan
public LdapsPanel(String id) {
super(id);
- DataView<LdapConfig> dataView = new
DataView<LdapConfig>("ldapList", new IDataProvider<LdapConfig>(){
- private static final long serialVersionUID = -1L;
-
- public void detach() {
- //empty
- }
-
- public Iterator<? extends LdapConfig> iterator(long
first, long count) {
- return
Application.getBean(LdapConfigDaoImpl.class).getNondeletedLdapConfig((int)first,
(int)count).iterator();
- }
-
- public long size() {
- return
Application.getBean(LdapConfigDaoImpl.class).selectMaxFromLdapConfig();
- }
-
- public IModel<LdapConfig> model(LdapConfig object) {
- return new
CompoundPropertyModel<LdapConfig>(object);
- }
-
- }) {
+ DataView<LdapConfig> dataView = new
DataView<LdapConfig>("ldapList"
+ , new
OmDataProvider<LdapConfig>(LdapConfigDaoImpl.class)) {
private static final long serialVersionUID =
8715559628755439596L;
@Override
@@ -79,9 +57,16 @@ public class LdapsPanel extends AdminPan
});
}
};
- dataView.setItemsPerPage(8); //FIXME need to be parametrized
- add(dataView);
- add(new AjaxPagingNavigator("navigator", dataView));
+ final WebMarkupContainer ldapListContainer = new
WebMarkupContainer("ldapListContainer");
+ add(ldapListContainer.add(dataView).setOutputMarkupId(true));
+ add(new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID =
5097048616003411362L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(ldapListContainer);
+ }
+ });
LdapConfig ldapConfig = new LdapConfig();
form = new LdapForm("form", ldapConfig);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Thu Sep 13 07:12:13 2012
@@ -18,22 +18,17 @@
*/
package org.apache.openmeetings.web.components.admin.user;
-import java.util.Iterator;
-
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.user.Users;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
public class UsersPanel extends AdminPanel {
private static final long serialVersionUID = -4463107742579790120L;
@@ -41,26 +36,7 @@ public class UsersPanel extends AdminPan
public UsersPanel(String id) {
super(id);
- DataView<Users> dataView = new DataView<Users>("userList", new
IDataProvider<Users>(){
- private static final long serialVersionUID =
-6822789354860988626L;
-
- public void detach() {
- //empty
- }
-
- public Iterator<? extends Users> iterator(long first,
long count) {
- return
Application.getBean(UsersDaoImpl.class).getNondeletedUsers((int)first,
(int)count).iterator();
- }
-
- public long size() {
- return
Application.getBean(UsersDaoImpl.class).selectMaxFromUsers();
- }
-
- public IModel<Users> model(Users object) {
- return new CompoundPropertyModel<Users>(object);
- }
-
- }) {
+ DataView<Users> dataView = new DataView<Users>("userList", new
OmDataProvider<Users>(UsersDaoImpl.class)) {
private static final long serialVersionUID =
8715559628755439596L;
@Override
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java?rev=1384221&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/data/OmDataProvider.java
Thu Sep 13 07:12:13 2012
@@ -0,0 +1,54 @@
+/*
+ * 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.apache.openmeetings.web.data;
+
+import java.util.Iterator;
+
+import org.apache.openmeetings.data.OmDAO;
+import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+
+public class OmDataProvider<T extends OmEntity> implements IDataProvider<T> {
+ private static final long serialVersionUID = 4325721185888905204L;
+ protected Class<? extends OmDAO<T>> clazz;
+
+ public OmDataProvider(Class<? extends OmDAO<T>> c) {
+ this.clazz = c;
+ }
+
+ public void detach() {
+ // does nothing
+ }
+
+ public Iterator<? extends T> iterator(long first, long count) {
+ return Application.getBean(clazz).get((int)first,
(int)count).iterator();
+ }
+
+ public long size() {
+ return Application.getBean(clazz).count();
+ }
+
+ public IModel<T> model(T object) {
+ return new CompoundPropertyModel<T>(object);
+ }
+
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Thu Sep 13 07:12:13 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<head>
- <title><span wicket:id="pageTitle">[title]</span></title>
+ <title wicket:id="pageTitle">[title]</title>
<link rel="stylesheet" type="text/css"
href="css/openmeetings-forms.css"/>
</head>
<body>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1384221&r1=1384220&r2=1384221&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
Thu Sep 13 07:12:13 2012
@@ -29,7 +29,7 @@ public abstract class BasePage extends W
public BasePage() {
String appName =
Application.getBean(Configurationmanagement.class).getAppName();
- add(new Label("pageTitle", appName).setRenderBodyOnly(true));
+ add(new Label("pageTitle", appName));
add(new HeaderPanel("header", appName));
}
}
