Author: solomax
Date: Sun Apr 20 16:41:53 2014
New Revision: 1588789
URL: http://svn.apache.org/r1588789
Log:
[OPENMEETINGS-980] Ivy version is updated; selenium version is updated; OpenJPA
version is updated; JGit version is updated; Asm version is updated
Modified:
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Sun Apr 20 16:41:53 2014
@@ -12,7 +12,7 @@
project.version=3.1.0
project.status=SNAPSHOT
project.distname=openmeetings
-ivy.install.version=2.3.0
+ivy.install.version=2.4.0-rc1
maven.version=3.0.4
red5.server.version=1.0.2-M1
laszlo.proxied=solo
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Sun Apr 20 16:41:53 2014
@@ -48,7 +48,7 @@
<dependency org="commons-io" name="commons-io" rev="2.4"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="asm" name="asm" rev="3.1" transitive="false">
+ <dependency org="asm" name="asm" rev="3.3.1" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.springframework" name="spring-aspects"
rev="4.0.0.RELEASE" transitive="false">
@@ -69,8 +69,7 @@
<dependency org="org.red5" name="red5-client" rev="1.0.2-RC2"
transitive="false">
<include type="jar" />
</dependency>
- <!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
- <dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec" rev="1.1" conf="mainlib.ext->*"
transitive="false"/>
+ <dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec" rev="1.1" transitive="false"/>
<!-- END OF mainlib -->
<!-- START OF ANAKIA -->
@@ -308,15 +307,28 @@
<include type="jar" />
</dependency>
<!-- Selenium -->
- <dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="openmeetings->*" rev="2.35.0" >
+ <dependency org="org.seleniumhq.selenium" name="selenium-java"
conf="openmeetings->*" rev="2.41.0" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.seleniumhq.selenium" name="selenium-api"
conf="openmeetings->*" rev="2.41.0" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.seleniumhq.selenium"
name="selenium-remote-driver" conf="openmeetings->*" rev="2.41.0"
transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.seleniumhq.selenium"
name="selenium-firefox-driver" conf="openmeetings->*" rev="2.41.0"
transitive="false">
<include type="jar" />
</dependency>
- <!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
- <dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="org.apache.openjpa" name="openjpa" rev="2.2.2"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="commons-lang" name="commons-lang" rev="2.6"
conf="openmeetings.ext->*" transitive="false"/> <!-- required by PCEnchancer -->
+ <dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5"
conf="openmeetings->*" transitive="false"/>
+ <dependency org="org.apache.openjpa" name="openjpa" rev="2.3.0"
conf="openmeetings->*" transitive="false"/>
+ <dependency org="org.apache.xbean" name="xbean-asm4-shaded"
rev="3.16" conf="openmeetings->*"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.6"
transitive="false"><!-- required by PCEnchancer -->
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.geronimo.specs"
name="geronimo-ejb_3.1_spec" rev="1.0.2" conf="openmeetings->*"
transitive="false"/>
+ <dependency org="javax.transaction" name="jta" rev="1.1"
conf="openmeetings->*" transitive="false"/>
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl"
rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
<exclude name='commons-logging' />
@@ -396,7 +408,7 @@
</dependency>
<!-- JGIT -->
- <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant"
conf="jgit->*" rev="3.3.1.201403241930-r" transitive="true" >
+ <dependency org="org.eclipse.jgit" name="org.eclipse.jgit.ant"
conf="jgit->*" rev="3.3.2.201404171909-r" transitive="true" >
<include type="jar" />
<exclude org="org.apache.ant"/>
</dependency>
@@ -404,6 +416,7 @@
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
<exclude org="cglib" module="cglib-nodep" type="*" ext="*"
conf="*" matcher="exact"/>
<exclude org="pull-parser" module="pull-parser" type="*"
ext="*" conf="*" matcher="exact"/>
+ <exclude org="org.apache.geronimo.specs"
module="geronimo-servlet_3.0_spec" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/FieldManager.java
Sun Apr 20 16:41:53 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.core.data.basic;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -37,7 +39,6 @@ import org.apache.openmeetings.db.dao.la
import org.apache.openmeetings.db.entity.label.FieldLanguage;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,9 +51,7 @@ import org.springframework.transaction.a
*/
@Transactional
public class FieldManager {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- FieldManager.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FieldManager.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -66,42 +65,6 @@ public class FieldManager {
@Autowired
private ConfigurationDao configurationDaoImpl;
- public String getString(Long fieldvalues_id, Long language_id) {
- String result = null;
- Fieldlanguagesvalues flv =
getFieldByIdAndLanguage(fieldvalues_id, language_id);
- if (flv != null) {
- result = performReplace(flv).getValue();
- }
- return result;
- }
-
- public Fieldlanguagesvalues getFieldByIdAndLanguage(Long fieldvalues_id,
- Long language_id) {
- try {
-
- String hql = "select f from Fieldlanguagesvalues as f "
- + "WHERE f.language_id = :language_id "
- + "AND f.fieldvalues_id =
:fieldvalues_id";
-
- Fieldlanguagesvalues flv = null;
-
- TypedQuery<Fieldlanguagesvalues> query =
em.createQuery(hql, Fieldlanguagesvalues.class);
-
- query.setParameter("fieldvalues_id", fieldvalues_id);
- query.setParameter("language_id", language_id);
- List<Fieldlanguagesvalues> fList =
query.getResultList();
-
- if (fList.size() > 0) {
- flv = fList.get(0); //replace should not be
performed here to enable string editing via admin
- }
-
- return flv;
- } catch (Exception ex2) {
- log.error("[getFieldByIdAndLanguage]: ", ex2);
- }
- return null;
- }
-
public List<Fieldlanguagesvalues> getAllFieldsByLanguage(Long
language_id) {
try {
@@ -187,69 +150,6 @@ public class FieldManager {
return null;
}
- public List<Fieldlanguagesvalues> getAllFieldsByLanguage(Long
language_id,
- int start, int max) {
- try {
-
- String sql = "select f from Fieldlanguagesvalues f
WHERE f.language_id = :language_id "
- + "AND f.fieldvalues_id >= :start AND
f.fieldvalues_id < :max";
-
- TypedQuery<Fieldlanguagesvalues> query =
em.createQuery(sql, Fieldlanguagesvalues.class);
- query.setParameter("language_id", language_id);
- query.setParameter("start", start);
- query.setParameter("max", start + max);
-
- List<Fieldlanguagesvalues> returnList =
performReplace(query.getResultList());
- FieldLanguage fieldLanguage = fieldLanguageDaoImpl
- .getFieldLanguageById(language_id);
-
- log.debug("GEtting all fields by language : "
- + fieldLanguage.getName());
-
- // Check for Right To Left Languages
- if (fieldLanguage.getRtl()) {
- log.debug("language : " +
fieldLanguage.getName()
- + " requieres RTL");
-
- List<Fieldlanguagesvalues> returnRtlList = new
LinkedList<Fieldlanguagesvalues>();
-
- for (Iterator<Fieldlanguagesvalues> iter =
returnList
- .iterator(); iter.hasNext();) {
- Fieldlanguagesvalues remote =
iter.next();
- Fieldlanguagesvalues toAdd = new
Fieldlanguagesvalues();
- toAdd.setFieldlanguagesvalues_id(remote
-
.getFieldlanguagesvalues_id());
-
toAdd.setFieldvalues_id(remote.getFieldvalues_id());
-
toAdd.setLanguage_id(remote.getLanguage_id());
-
- String[] splitted =
remote.getValue().split(" ");
- String reverseOrder = "";
- for (int i = splitted.length - 1; i >=
0; i--) {
- reverseOrder += splitted[i];
- if (splitted.length != 1) {
- reverseOrder += " ";
- }
- }
- toAdd.setValue(reverseOrder);
-
- returnRtlList.add(toAdd);
- }
-
- return returnRtlList;
- } else {
- log.debug("language : " +
fieldLanguage.getName()
- + " requieres NO RTL");
-
- return returnList;
-
- }
-
- } catch (Exception ex2) {
- log.error("[getConfKey]: ", ex2);
- }
- return null;
- }
-
public Long addFieldValueByFieldAndLanguage(Fieldvalues fv,
Long language_id, String fieldvalue) {
try {
@@ -319,11 +219,6 @@ public class FieldManager {
return fv;
}
- private Fieldlanguagesvalues performReplace(Fieldlanguagesvalues f) {
- String appName = configurationDaoImpl.getAppName();
- return performReplace(f, appName);
- }
-
private String performReplace(String val, String appName) {
return val == null ? val : val.replaceAll("\\$APP_NAME",
appName);
}
@@ -332,7 +227,6 @@ public class FieldManager {
Fieldlanguagesvalues r = new Fieldlanguagesvalues();
r.setDeleted(f.getDeleted());
r.setFieldlanguagesvalues_id(f.getFieldlanguagesvalues_id());
- r.setFieldvalues_id(f.getFieldvalues_id());
r.setLanguage_id(f.getLanguage_id());
r.setStarttime(f.getStarttime());
r.setUpdatetime(f.getUpdatetime());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
Sun Apr 20 16:41:53 2014
@@ -30,13 +30,13 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
@@ -66,7 +66,7 @@ public class AppointmentLogic {
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private FieldManager fieldManager;
+ private FieldLanguagesValuesDao langDao;
@Autowired
private RoomDao roomDao;
@Autowired
@@ -159,9 +159,9 @@ public class AppointmentLogic {
long language_id = u.getLanguage_id();
// Get the required labels one time for all meeting members. The
// Language of the email will be the system default language
- String labelid1158 = fieldManager.getString(1158L, language_id);
- String labelid1153 = fieldManager.getString(1153L, language_id);
- String labelid1154 = fieldManager.getString(1154L, language_id);
+ String labelid1158 = langDao.getString(1158L, language_id);
+ String labelid1153 = langDao.getString(1153L, language_id);
+ String labelid1154 = langDao.getString(1154L, language_id);
String subject = generateSubject(labelid1158, a, tZone);
String smsSubject = generateSMSSubject(labelid1158, a);
@@ -282,7 +282,7 @@ public class AppointmentLogic {
message.append(" ").append(ment.getTitle());
if (ment.getDescription() != null &&
ment.getDescription().length() > 0) {
- message.append(fieldManager.getString(1152L,
language_id)).append(ment.getDescription());
+ message.append(langDao.getString(1152L,
language_id)).append(ment.getDescription());
}
message.append("<br/>").append(labelid1153).append(' ')
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
Sun Apr 20 16:41:53 2014
@@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
-import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.room.Client;
@@ -60,7 +60,7 @@ public class ScreenController {
@Autowired
public ConfigurationDao configurationDao;
@Autowired
- public FieldManager fieldManager;
+ public FieldLanguagesValuesDao labelDao;
private enum ConnectionType {
rtmp
@@ -75,7 +75,7 @@ public class ScreenController {
if (delim) {
result.append(';');
}
-
result.append(fieldManager.getFieldByIdAndLanguage((long)id,
language_id).getValue());
+ result.append(labelDao.getString(id, language_id));
delim = true;
}
return result.toString();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
Sun Apr 20 16:41:53 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.test;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Date;
import java.util.List;
@@ -28,6 +29,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.room.RoomTypeDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -63,6 +65,8 @@ public abstract class AbstractJUnitDefau
private ImportInitvalues importInitvalues;
@Autowired
private ConfigurationDao configurationDao;
+ @Autowired
+ private FieldLanguagesValuesDao labelDao;
private List<AppointmentReminderTyps> remindTypes;
private List<RoomType> roomTypes;
@@ -76,6 +80,9 @@ public abstract class AbstractJUnitDefau
} else {
log.info("Default scheme already created");
}
+ if (labelDao.count() < 1000) {
+ fail("No languages were installed");
+ }
if (configKeyCryptClassName == null) {
assertNotNull("Crypt class name should not be null",
configurationDao.getCryptKey());
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
Sun Apr 20 16:41:53 2014
@@ -157,15 +157,14 @@ public class FillLabels extends Abstract
for (@SuppressWarnings("unchecked")
Iterator<Element> i = root.elementIterator(); i.hasNext();) {
Element itemObject = i.next();
- Long fieldvalues_id = Long.valueOf(
-
itemObject.attribute("id").getText()).longValue();
+ Long fieldvalues_id =
Long.valueOf(itemObject.attribute("id").getText()).longValue();
String fieldName =
itemObject.attribute("name").getText();
String value = itemObject.element("value").getText();
- Fieldlanguagesvalues fValue = new
Fieldlanguagesvalues();
- fValue.setFieldvalues_id(fieldvalues_id);
- fValue.setValue(value);
Fieldvalues fLabel = new Fieldvalues();
+ fLabel.setFieldvalues_id(fieldvalues_id);
fLabel.setName(fieldName);
+ Fieldlanguagesvalues fValue = new
Fieldlanguagesvalues();
+ fValue.setValue(value);
fValue.setFieldvalues(fLabel);
labelsArray.put(fieldvalues_id, fValue);
@@ -188,7 +187,7 @@ public class FillLabels extends Abstract
for (Entry<Long, Fieldlanguagesvalues> entryLabel :
labelsArray.entrySet()) {
Element eTemp = root.addElement("string")
- .addAttribute("id",
entryLabel.getValue().getFieldvalues_id().toString())
+ .addAttribute("id",
entryLabel.getValue().getFieldvalues().getFieldvalues_id().toString())
.addAttribute("name",
entryLabel.getValue().getFieldvalues().getName());
Element value = eTemp.addElement("value");
value.addText(entryLabel.getValue().getValue());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/labels/TestGetFieldValues.java
Sun Apr 20 16:41:53 2014
@@ -18,9 +18,13 @@
*/
package org.apache.openmeetings.test.labels;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.label.FieldValueDao;
+import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
@@ -32,15 +36,22 @@ import org.springframework.beans.factory
*
*/
public class TestGetFieldValues extends AbstractJUnitDefaults {
-
@Autowired
- private FieldValueDao fieldValueDao;
+ private FieldLanguageDao langDao;
+ @Autowired
+ private FieldValueDao langValueDao;
+ @Autowired
+ private FieldLanguagesValuesDao labelDao;
@Test
public void testCount() throws Exception {
- Fieldvalues fv = fieldValueDao.get(1L);
+ int langCount = langDao.getLanguages().size();
+ assertTrue("Languages should not be empty: " + langCount,
langCount > 0);
+ Fieldvalues fv = langValueDao.get(1L);
+ assertNotNull("Fieldvalues should not be null", fv);
- assertTrue("Fieldvalues should not be null", (fv != null));
+ Fieldlanguagesvalues flv = labelDao.get(1L);
+ assertNotNull("Fieldlanguagesvalues should not be null", flv);
+ assertNotNull("Fieldvalues of Fieldlanguagesvalues should not
be null", flv.getFieldvalues());
}
-
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
Sun Apr 20 16:41:53 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.calendar;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import java.util.List;
@@ -29,7 +31,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,7 @@ import org.springframework.transaction.a
@Transactional
public class AppointmentReminderTypDao {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- AppointmentReminderTypDao.class,
- OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentReminderTypDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -76,9 +74,7 @@ public class AppointmentReminderTypDao {
public Long updateAppointmentReminderTyps(Long typId, String name) {
try {
-
- AppointmentReminderTyps ac = this
- .get(typId);
+ AppointmentReminderTyps ac = get(typId);
ac.setName(name);
ac.setUpdatetime(new Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
Sun Apr 20 16:41:53 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.label;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -28,7 +30,6 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -40,11 +41,9 @@ import org.springframework.transaction.a
*/
@Transactional
public class FieldLanguageDao implements Serializable {
-
private static final long serialVersionUID = -2714490167956230305L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- FieldLanguageDao.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FieldLanguageDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -93,13 +92,11 @@ public class FieldLanguageDao implements
em.merge(fl);
}
- public void updateLanguage(FieldLanguage fl) {
+ public void update(FieldLanguage fl) {
if (fl.getLanguage_id() == null) {
em.persist(fl);
} else {
- if (!em.contains(fl)) {
- em.merge(fl);
- }
+ em.merge(fl);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
Sun Apr 20 16:41:53 2014
@@ -42,19 +42,19 @@ import org.apache.openmeetings.db.entity
@NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = :language_id ORDER BY
flv.fieldvalues_id ASC")
- , @NamedQuery(name="allFieldValuesIds", query = "SELECT
flv.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ + " AND flv.language_id = :language_id ORDER BY
flv.fieldvalues.fieldvalues_id ASC")
+ , @NamedQuery(name="allFieldValuesIds", query = "SELECT
flv.fieldvalues.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = :language_id")
, @NamedQuery(name="allNotTranslatedValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = 1 AND flv.fieldvalues_id
NOT IN (:id_list)")
+ + " AND flv.language_id = 1 AND
flv.fieldvalues.fieldvalues_id NOT IN (:id_list)")
, @NamedQuery(name="getFieldLanguagesValuesById"
, query = "SELECT f FROM Fieldlanguagesvalues f WHERE
f.fieldlanguagesvalues_id = :id")
, @NamedQuery(name="getFieldLanguagesValuesByValueAndLang"
- , query = "SELECT f FROM Fieldlanguagesvalues f WHERE
f.fieldvalues_id = :fieldValuesId AND f.language_id = :lang AND f.deleted =
false")
+ , query = "SELECT f FROM Fieldlanguagesvalues f WHERE
f.fieldvalues.fieldvalues_id = :fieldValuesId AND f.language_id = :lang AND
f.deleted = false")
})
@Table(name = "fieldlanguagesvalues")
public class Fieldlanguagesvalues implements Serializable, IDataProviderEntity
{
@@ -64,9 +64,6 @@ public class Fieldlanguagesvalues implem
@Column(name="id")
private Long fieldlanguagesvalues_id;
- @Column(name="fieldvalues_id")
- private Long fieldvalues_id;
-
@Column(name="language_id")
private Long language_id;
@@ -120,13 +117,6 @@ public class Fieldlanguagesvalues implem
this.deleted = deleted;
}
- public Long getFieldvalues_id() {
- return fieldvalues_id;
- }
- public void setFieldvalues_id(Long fieldvalues_id) {
- this.fieldvalues_id = fieldvalues_id;
- }
-
public Long getLanguage_id() {
return language_id;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
Sun Apr 20 16:41:53 2014
@@ -564,7 +564,7 @@ public class Admin {
}
}
- public static void dropDB() throws Exception {
+ public void dropDB() throws Exception {
File conf = new File(OmFileHelper.getWebinfDir(),
PERSISTENCE_NAME);
ConnectionProperties connectionProperties =
ConnectionPropertiesPatcher.getConnectionProperties(conf);
immediateDropDB(connectionProperties);
@@ -580,7 +580,21 @@ public class Admin {
return (LogImpl)conf.getLog(JDBCConfiguration.LOG_SCHEMA);
}
- private static void immediateDropDB(ConnectionProperties props) throws
Exception {
+ private static void runSchemaTool(JDBCConfigurationImpl conf, String
action) throws Exception {
+ SchemaTool st = new SchemaTool(conf, action);
+ st.setIgnoreErrors(true);
+ st.setOpenJPATables(true);
+ st.setIndexes(false);
+ st.setPrimaryKeys(false);
+ if (!SchemaTool.ACTION_DROPDB.equals(action)) {
+ st.setSchemaGroup(st.getDBSchemaGroup());
+ }
+ st.run();
+ }
+
+ private void immediateDropDB(ConnectionProperties props) throws
Exception {
+ ctx.destroy();
+ ctx = null;
JDBCConfigurationImpl conf = new JDBCConfigurationImpl();
try {
conf.setPropertiesFile(new File(OmFileHelper.getWebinfDir(),
PERSISTENCE_NAME));
@@ -590,12 +604,8 @@ public class Admin {
conf.setConnectionPassword(props.getPassword());
//HACK to suppress all warnings
getLogImpl(conf).setLevel(Log.INFO);
- SchemaTool st = new SchemaTool(conf, SchemaTool.ACTION_DROPDB);
- st.setIgnoreErrors(true);
- st.setOpenJPATables(true);
- st.setIndexes(false);
- st.setPrimaryKeys(false);
- st.run();
+ runSchemaTool(conf, SchemaTool.ACTION_DROPDB);
+ runSchemaTool(conf, SchemaTool.ACTION_CREATEDB);
} finally {
conf.close();
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Sun Apr 20 16:41:53 2014
@@ -705,11 +705,10 @@ public class ImportInitvalues {
Map<Integer, Map<String, Object>> languages = new
LinkedHashMap<Integer, Map<String, Object>>();
SAXReader reader = new SAXReader();
- Document document = reader
- .read(new File(OmFileHelper.getLanguagesDir(),
-
OmFileHelper.nameOfLanguageFile));
-
- Element root = document.getRootElement();
+ File langFile = new File(OmFileHelper.getLanguagesDir(),
OmFileHelper.nameOfLanguageFile);
+ log.debug("File to load languages from is: " +
langFile.getCanonicalPath());
+
+ Element root = reader.read(langFile).getRootElement();
for (@SuppressWarnings("unchecked")
Iterator<Element> it = root.elementIterator("lang");
it.hasNext();) {
@@ -753,12 +752,9 @@ public class ImportInitvalues {
public void loadInitAppointmentReminderTypes() {
log.debug("ImportInitValues.loadInitAppointmentReminderTypes");
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "do not send notification", 1568);
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "simple email", 1569);
- appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "iCal email", 1570);
+ appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
"do not send notification", 1568);
+ appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
"simple email", 1569);
+ appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
"iCal email", 1570);
}
public void loadLanguagesFile(int langId) throws Exception {
@@ -768,6 +764,7 @@ public class ImportInitvalues {
public void loadLanguagesFile(String langName) throws Exception {
Map<Integer, Map<String, Object>> listlanguages =
getLanguageFiles();
+ log.debug("Number of languages found: " + listlanguages.size());
for (int langId : listlanguages.keySet()) {
Map<String, Object> langMap = listlanguages.get(langId);
if (langName.equals(langMap.get("name"))) {
@@ -849,7 +846,7 @@ public class ImportInitvalues {
}
}
lang.setLanguageValues(flvMap.values());
- fieldLanguageDaoImpl.updateLanguage(lang);
+ fieldLanguageDaoImpl.update(lang);
log.debug("Lang ADDED: " + lang + "; seconds passed: " +
(System.currentTimeMillis() - ticks) / 1000);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
Sun Apr 20 16:41:53 2014
@@ -27,10 +27,10 @@ import java.util.HashMap;
import java.util.TimeZone;
import java.util.Vector;
-import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.core.mail.SMSHandler;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
@@ -64,7 +64,7 @@ public class InvitationManager implement
@Autowired
private InvitationDao invitationDao;
@Autowired
- private FieldManager fieldManager;
+ private FieldLanguagesValuesDao langDao;
@Autowired
private MailHandler mailHandler;
@Autowired
@@ -76,7 +76,7 @@ public class InvitationManager implement
private String formatSubject(Long langId, Appointment a, TimeZone tz) {
- String message = fieldManager.getString(1151L, langId) + " " +
a.getTitle();
+ String message = langDao.getString(1151L, langId) + " " +
a.getTitle();
message += " "
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz);
@@ -88,29 +88,29 @@ public class InvitationManager implement
}
private String formatMessage(Long langId, Appointment a, TimeZone tz,
String invitorName) {
- String message = fieldManager.getString(1151L, langId) + " " +
a.getTitle();
+ String message = langDao.getString(1151L, langId) + " " +
a.getTitle();
if (a.getDescription() != null && a.getDescription().length()
!= 0) {
- message += fieldManager.getString(1152L, langId) +
a.getDescription();
+ message += langDao.getString(1152L, langId) +
a.getDescription();
}
message += "<br/>"
- + fieldManager.getString(1153L, langId)
+ + langDao.getString(1153L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += fieldManager.getString(1154L, langId)
+ message += langDao.getString(1154L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz) +
"<br/>";
- message += fieldManager.getString(1156L, langId) + invitorName
+ "<br/>";
+ message += langDao.getString(1156L, langId) + invitorName +
"<br/>";
return message;
}
private String formatCancelSubject(Long langId, Appointment a, TimeZone
tz) {
- String message = fieldManager.getString(1157L, langId) +
a.getTitle();
+ String message = langDao.getString(1157L, langId) +
a.getTitle();
message += " "
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
@@ -122,24 +122,24 @@ public class InvitationManager implement
private String formatCancelMessage(Long langId, Appointment a, TimeZone
tz, String invitorName) {
try {
- String message = fieldManager.getString(1157L, langId)
+ a.getTitle();
+ String message = langDao.getString(1157L, langId) +
a.getTitle();
if (a.getDescription() != null &&
a.getDescription().length() != 0) {
- message += fieldManager.getString(1152L,
langId) + a.getDescription();
+ message += langDao.getString(1152L, langId) +
a.getDescription();
}
message += "<br/>"
- + fieldManager.getString(1153L, langId)
+ + langDao.getString(1153L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += fieldManager.getString(1154L, langId)
+ message += langDao.getString(1154L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)
+ "<br/>";
- message += fieldManager.getString(1156L, langId) +
invitorName + "<br/>";
+ message += langDao.getString(1156L, langId) +
invitorName + "<br/>";
return message;
} catch (Exception err) {
@@ -149,7 +149,7 @@ public class InvitationManager implement
}
private String formatUpdateSubject(Long langId, Appointment a, TimeZone
tz) {
- String message = fieldManager.getString(1155L, langId) + " " +
a.getTitle();
+ String message = langDao.getString(1155L, langId) + " " +
a.getTitle();
message += " "
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
@@ -161,24 +161,24 @@ public class InvitationManager implement
private String formatUpdateMessage(Long langId, Appointment a, TimeZone
tz, String invitorName) {
try {
- String message = fieldManager.getString(1155L, langId)
+ " " + a.getTitle();
+ String message = langDao.getString(1155L, langId) + " "
+ a.getTitle();
if (a.getDescription().length() != 0) {
- message += fieldManager.getString(1152L,
langId) + a.getDescription();
+ message += langDao.getString(1152L, langId) +
a.getDescription();
}
message += "<br/>"
- + fieldManager.getString(1153L, langId)
+ + langDao.getString(1153L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)
+ "<br/>";
- message += fieldManager.getString(1154L, langId)
+ message += langDao.getString(1154L, langId)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)
+ "<br/>";
- message += fieldManager.getString(1156L, langId) +
invitorName + "<br/>";
+ message += langDao.getString(1156L, langId) +
invitorName + "<br/>";
return message;
} catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sun Apr 20
16:41:53 2014
@@ -36,7 +36,7 @@
<select2.version>2.2.2</select2.version>
<dnd.version>0.6.0</dnd.version>
<commons-io.version>2.4</commons-io.version>
- <selenium.version>2.35.0</selenium.version>
+ <selenium.version>2.41.0</selenium.version>
</properties>
<dependencies>
<dependency>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
Sun Apr 20 16:41:53 2014
@@ -63,7 +63,7 @@ public class AddLanguageForm extends For
fl.setCode(newLanguageISO);
try {
- langDao.updateLanguage(fl);
+ langDao.update(fl);
} catch (Exception e) {
// TODO add feedback message
e.printStackTrace();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
Sun Apr 20 16:41:53 2014
@@ -95,7 +95,7 @@ public class LangForm extends Form<Void>
langPanel.language.setDeleted(true);
FieldLanguageDao langDao =
getBean(FieldLanguageDao.class);
try {
-
langDao.updateLanguage(langPanel.language);
+ langDao.update(langPanel.language);
} catch (Exception e) {
// TODO add feedback message
e.printStackTrace();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1588789&r1=1588788&r2=1588789&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
Sun Apr 20 16:41:53 2014
@@ -144,7 +144,7 @@ public class LangPanel extends AdminPane
});
item.add(AttributeModifier.append("class",
"clickable "
+ (item.getIndex() % 2 == 1 ?
"even" : "odd")
- +
(fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues_id()) ? "
selected" : "")));
+ +
(fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues().getFieldvalues_id())
? " selected" : "")));
}
};
