Author: solomax
Date: Thu Jul 26 07:23:17 2012
New Revision: 1365899
URL: http://svn.apache.org/viewvc?rev=1365899&view=rev
Log:
OPENMEETINGS-107 partially done
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java
- copied, changed from r1365893,
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
Thu Jul 26 07:23:17 2012
@@ -119,7 +119,7 @@
<![CDATA[
if ($debug) Debug.write("getActiveLdapConfigs: ",value);
for (var i=0;i<value.length;i++) {
- parent.addItem(value[i].name,value[i].ldapConfigId);
+ parent.addItem(value[i].name,value[i].id);
}
var g = canvas.getUserData();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
Thu Jul 26 07:23:17 2012
@@ -81,7 +81,7 @@
for (var i=0;i<records.length;i++){
new lz.ldapAdminListItem(this._innerlist._inn._inn,{
obj:records[i],
- ldapConfigId:records[i].ldapConfigId,
+ ldapConfigId:records[i].id,
tName:records[i].name,
configFileName:records[i].configFileName
});
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
Thu Jul 26 07:23:17 2012
@@ -84,7 +84,7 @@
if (obj == null) {
return;
}
- this.ldapConfigId = obj.ldapConfigId;
+ this.ldapConfigId = obj.id;
this.tName.setAttribute('text',obj.name);
this.configFileName.setAttribute('text',obj.configFileName);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
Thu Jul 26 07:23:17 2012
@@ -26,7 +26,7 @@
<class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValue</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Thu Jul 26 07:23:17 2012
@@ -26,7 +26,7 @@
<class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValue</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
Thu Jul 26 07:23:17 2012
@@ -26,7 +26,7 @@
<class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValue</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
Thu Jul 26 07:23:17 2012
@@ -26,7 +26,7 @@
<class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValue</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
Thu Jul 26 07:23:17 2012
@@ -26,7 +26,7 @@
<class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValue</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
Thu Jul 26 07:23:17 2012
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.persistence.beans.basic.ErrorType;
-import org.openmeetings.app.persistence.beans.basic.ErrorValues;
+import org.openmeetings.app.persistence.beans.basic.ErrorValue;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -44,12 +44,12 @@ public class ErrorManagement {
public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
try {
ErrorType eType = new ErrorType();
- eType.setErrortype_id(errortype_id);
+ eType.setId(errortype_id);
eType.setStarttime(new Date());
eType.setDeleted(false);
eType.setFieldvalues_id(fieldvalues_id);
eType = em.merge(eType);
- Long newerrortype_id = eType.getErrortype_id();
+ Long newerrortype_id = eType.getId();
return newerrortype_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
@@ -74,7 +74,7 @@ public class ErrorManagement {
public ErrorType getErrorType(Long errortype_id) {
try {
String hql = "select c from ErrorType as c "
- + "WHERE c.deleted <> :deleted AND
c.errortype_id = :errortype_id";
+ + "WHERE c.deleted <> :deleted AND c.id
= :errortype_id";
TypedQuery<ErrorType> query = em.createQuery(hql,
ErrorType.class);
query.setParameter("deleted", true);
query.setParameter("errortype_id", errortype_id);
@@ -88,14 +88,14 @@ public class ErrorManagement {
public Long addErrorValues(Long errorvalues_id, Long errortype_id,
Long fieldvalues_id) {
try {
- ErrorValues eValue = new ErrorValues();
- eValue.setErrorvalues_id(errorvalues_id);
- eValue.setErrortype_id(errortype_id);
+ ErrorValue eValue = new ErrorValue();
+ eValue.setId(errorvalues_id);
+ eValue.setType(getErrorType(errortype_id));
eValue.setDeleted(false);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- return eValue.getErrorvalues_id();
+ return eValue.getId();
} catch (Exception ex2) {
log.error("[addErrorValues]: ", ex2);
}
@@ -104,12 +104,12 @@ public class ErrorManagement {
public Long getErrorValueById(Long errortype_id, Long fieldvalues_id) {
try {
- ErrorValues eValue = new ErrorValues();
- eValue.setErrortype_id(errortype_id);
+ ErrorValue eValue = new ErrorValue();
+ eValue.setType(getErrorType(errortype_id));
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
+ Long newerrorvalues_id = eValue.getId();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[getErrorValueById]: ", ex2);
@@ -119,12 +119,12 @@ public class ErrorManagement {
public Long updateErrorValues(Long errortype_id, Long fieldvalues_id) {
try {
- ErrorValues eValue = new ErrorValues();
- eValue.setErrortype_id(errortype_id);
+ ErrorValue eValue = new ErrorValue();
+ eValue.setType(getErrorType(errortype_id));
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
+ Long newerrorvalues_id = eValue.getId();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
@@ -132,15 +132,15 @@ public class ErrorManagement {
return null;
}
- public ErrorValues getErrorValuesById(Long errorvalues_id) {
+ public ErrorValue getErrorValuesById(Long errorvalues_id) {
try {
- String hql = "select c from ErrorValues as c "
- + " where c.errorvalues_id =
:errorvalues_id "
+ String hql = "select c from ErrorValue as c "
+ + " where c.id = :errorvalues_id "
+ " AND c.deleted <> :deleted";
- TypedQuery<ErrorValues> query = em.createQuery(hql,
ErrorValues.class);
+ TypedQuery<ErrorValue> query = em.createQuery(hql,
ErrorValue.class);
query.setParameter("errorvalues_id", errorvalues_id);
query.setParameter("deleted", true);
- ErrorValues e = null;
+ ErrorValue e = null;
try {
e = query.getSingleResult();
} catch (NoResultException ex) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
Thu Jul 26 07:23:17 2012
@@ -67,7 +67,7 @@ public class LdapConfigDaoImpl {
log.debug("addLdapConfig :2: "+insertedby);
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getLdapConfigId();
+ Long ldapConfigId = ldapConfig.getId();
if (ldapConfigId > 0) {
return ldapConfigId;
@@ -89,7 +89,7 @@ public class LdapConfigDaoImpl {
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getLdapConfigId();
+ Long ldapConfigId = ldapConfig.getId();
if (ldapConfigId > 0) {
return ldapConfigId;
@@ -128,7 +128,7 @@ public class LdapConfigDaoImpl {
log.debug("updateLdapConfig :2: "+updatedby);
ldapConfig = em.merge(ldapConfig);
- ldapConfigId = ldapConfig.getLdapConfigId();
+ ldapConfigId = ldapConfig.getId();
return ldapConfigId;
@@ -142,7 +142,7 @@ public class LdapConfigDaoImpl {
try {
String hql = "select c from LdapConfig c " +
- "WHERE c.ldapConfigId = :ldapConfigId "
+
+ "WHERE c.id = :ldapConfigId " +
"AND c.deleted = :deleted";
TypedQuery<LdapConfig> query = em.createQuery(hql,
LdapConfig.class);
@@ -191,7 +191,7 @@ public class LdapConfigDaoImpl {
try {
log.debug("selectMaxFromConfigurations ");
//get all users
- TypedQuery<Long> query = em.createQuery("select
count(c.ldapConfigId) from LdapConfig c where c.deleted = false", Long.class);
+ TypedQuery<Long> query = em.createQuery("select
count(c.id) from LdapConfig c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromLdapConfig" + ll.get(0));
return ll.get(0);
@@ -210,7 +210,7 @@ public class LdapConfigDaoImpl {
return null;
}
- ldapConfig = em.find(LdapConfig.class,
ldapConfig.getLdapConfigId());
+ ldapConfig = em.find(LdapConfig.class,
ldapConfig.getId());
em.remove(ldapConfig);
return ldapConfigId;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
Thu Jul 26 07:23:17 2012
@@ -27,13 +27,13 @@ import javax.persistence.Id;
import javax.persistence.Table;
@Entity
-@Table(name = "errortypes")
+@Table(name = "errortype")
public class ErrorType implements Serializable {
private static final long serialVersionUID = 1519570470483604258L;
@Id
- @Column(name = "errortype_id")
- private Long errortype_id;
+ @Column(name = "id")
+ private Long id;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@@ -45,12 +45,12 @@ public class ErrorType implements Serial
@Column(name = "deleted")
private boolean deleted;
- public Long getErrortype_id() {
- return errortype_id;
+ public Long getId() {
+ return id;
}
- public void setErrortype_id(Long errortype_id) {
- this.errortype_id = errortype_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Copied:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java
(from r1365893,
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java&r1=1365893&r2=1365899&rev=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java
Thu Jul 26 07:23:17 2012
@@ -23,19 +23,23 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
-@Table(name = "errorvalues")
-public class ErrorValues implements Serializable {
+@Table(name = "errorvalue")
+public class ErrorValue implements Serializable {
private static final long serialVersionUID = -1892810463706968018L;
@Id
- @Column(name = "errorvalues_id")
- private Long errorvalues_id;
- @Column(name = "errortype_id")
- private Long errortype_id;
+ @Column(name = "id")
+ private Long id;
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "errortype_id")
+ private ErrorType type;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@Column(name = "starttime")
@@ -45,12 +49,12 @@ public class ErrorValues implements Seri
@Column(name = "deleted")
private boolean deleted;
- public Long getErrorvalues_id() {
- return errorvalues_id;
+ public Long getId() {
+ return id;
}
- public void setErrorvalues_id(Long errorvalues_id) {
- this.errorvalues_id = errorvalues_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
@@ -85,12 +89,11 @@ public class ErrorValues implements Seri
this.fieldvalues_id = fieldvalues_id;
}
- public Long getErrortype_id() {
- //return errorType.getErrortype_id();
- return errortype_id;
+ public ErrorType getType() {
+ return type;
}
- public void setErrortype_id(Long errortype_id) {
- this.errortype_id = errortype_id;
+ public void setType(ErrorType type) {
+ this.type = type;
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
Thu Jul 26 07:23:17 2012
@@ -37,13 +37,11 @@ import javax.persistence.Table;
@Entity
@Table(name = "ldapconfig")
public class LdapConfig implements Serializable {
-
private static final long serialVersionUID = 2839158519803993035L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="ldapconfig_id")
- public long ldapConfigId;
+ @Column(name="id")
+ public long id;
@Column(name="name")
public String name;
@Column(name="config_file_name")
@@ -67,11 +65,11 @@ public class LdapConfig implements Seria
@Column(name="deleted")
private boolean deleted;
- public long getLdapConfigId() {
- return ldapConfigId;
+ public long getId() {
+ return id;
}
- public void setLdapConfigId(long ldapConfigId) {
- this.ldapConfigId = ldapConfigId;
+ public void setId(long id) {
+ this.id = id;
}
public String getName() {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
Thu Jul 26 07:23:17 2012
@@ -22,7 +22,7 @@ import org.openmeetings.app.Openmeetings
import org.openmeetings.app.data.basic.ErrorManagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.beans.basic.ErrorResult;
-import org.openmeetings.app.persistence.beans.basic.ErrorValues;
+import org.openmeetings.app.persistence.beans.basic.ErrorValue;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -58,12 +58,12 @@ public class ErrorService {
if (errorid < 0) {
log.debug("errorid, language_id: " + errorid + "|" +
language_id);
- ErrorValues eValues =
errorManagement.getErrorValuesById(-1
+ ErrorValue eValues =
errorManagement.getErrorValuesById(-1
* errorid);
if (eValues != null) {
log.debug("eValues.getFieldvalues_id() = " +
eValues.getFieldvalues_id());
//
log.debug(eValues.getFieldvalues().getFieldvalues_id());
- log.debug("eValues.getErrorType() = " +
errorManagement.getErrorType(eValues.getErrortype_id()));
+ log.debug("eValues.getErrorType() = " +
errorManagement.getErrorType(eValues.getType().getId()));
//
log.debug(eValues.getErrorType().getErrortype_id());
//
log.debug(eValues.getErrorType().getFieldvalues());
//
log.debug(eValues.getErrorType().getFieldvalues().getFieldvalues_id());
@@ -71,7 +71,7 @@ public class ErrorService {
.getFieldByIdAndLanguage(eValues.getFieldvalues_id(),
language_id);
Fieldlanguagesvalues typeValue = fieldmanagment
-
.getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getErrortype_id())
+
.getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getType().getId())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid,
errorValue.getValue(),
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java
Thu Jul 26 07:23:17 2012
@@ -78,7 +78,7 @@ public class LdapConfigService {
LdapConfig ldapConfig = new LdapConfig();
ldapConfig.setName("local DB [internal]");
- ldapConfig.setLdapConfigId(-1);
+ ldapConfig.setId(-1);
List<LdapConfig> returnldapConfigs = new
LinkedList<LdapConfig>();
returnldapConfigs.add(ldapConfig);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java?rev=1365899&r1=1365898&r2=1365899&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
Thu Jul 26 07:23:17 2012
@@ -34,7 +34,7 @@ import org.openmeetings.app.data.user.Or
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.basic.ErrorValues;
+import org.openmeetings.app.persistence.beans.basic.ErrorValue;
import org.openmeetings.app.persistence.beans.basic.RemoteSessionObject;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
@@ -143,7 +143,7 @@ public class UserWebService {
public ErrorResult getErrorByCode(String SID, long errorid, long
language_id) {
try {
if (errorid < 0) {
- ErrorValues eValues = errorManagement
+ ErrorValue eValues = errorManagement
.getErrorValuesById(errorid *
(-1));
if (eValues != null) {
Fieldlanguagesvalues errorValue =
fieldmanagment
@@ -151,7 +151,7 @@ public class UserWebService {
eValues.getFieldvalues_id(), language_id);
Fieldlanguagesvalues typeValue =
fieldmanagment
.getFieldByIdAndLanguage(errorManagement
-
.getErrorType(eValues.getErrortype_id())
+
.getErrorType(eValues.getType().getId())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid,
errorValue.getValue(),
