You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/03 07:18:34 UTC
svn commit: r1519559 - in /openmeetings/trunk/singlewebapp: ./ docs/
src/main/java/org/apache/openmeetings/data/basic/
src/main/java/org/apache/openmeetings/data/user/
src/main/java/org/apache/openmeetings/installation/
src/main/java/org/apache/openmee...
Author: solomax
Date: Tue Sep 3 05:18:33 2013
New Revision: 1519559
URL: http://svn.apache.org/r1519559
Log:
[OPENMEETINGS-778] language files are updated;tests are fixed;debug info for menu is added;chat messages are added to backup/restore;code clean up;xsd attribute in language export is fixed;missing labels are added;
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/JUnitTesting.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Sep 3 05:18:33 2013
@@ -544,7 +544,8 @@
<target name="compile.only"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,resources,compile.only.nocheck"/>
- <target name="compile.only.nocheck" depends="clean.classes, prepare.mkdir">
+ <target name="compile.only.nocheck" depends="clean.classes">
+ <antcall target="prepare.mkdir" inheritAll="true" inheritRefs="true"/>
<echo message="Compile main to ${main.out.dir}" />
<javac debug="on" debuglevel="lines,vars,source" destdir="${main.out.dir}" includeantruntime="false"
source="1.6" target="1.6">
@@ -776,7 +777,7 @@
<junit maxmemory="1024m" printsummary="yes" dir="${junit.base.dir}" tempdir="${junit.base.dir}" fork="yes"
forkmode="perBatch" failureproperty="junit.failed" errorproperty="junit.error">
<classpath refid="junit.classpath" />
- <jvmarg value="-Dom.home=${basedir}/${om.dist.webapp}" />
+ <jvmarg value="-Dom.home=${webapp.dir}" />
<jvmarg value="-Dred5.root=${red5.root}" />
<jvmarg value="-Dbasedir=${basedir}" />
<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
Modified: openmeetings/trunk/singlewebapp/docs/JUnitTesting.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/JUnitTesting.html?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/JUnitTesting.html (original)
+++ openmeetings/trunk/singlewebapp/docs/JUnitTesting.html Tue Sep 3 05:18:33 2013
@@ -728,6 +728,7 @@ limitations under the License.
<div class="xmlcode">
-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.jar
-Dom.home=${workspace_loc:Openmeetings}/src/main/webapp
+ -Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups
</div>
</li>
<li>To avoid temporary files being created in OM root, modify
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java Tue Sep 3 05:18:33 2013
@@ -64,65 +64,6 @@ public class FieldManager {
@Autowired
private ConfigurationDao configurationDaoImpl;
- // Reflect the Reverse Order!!
- public Fieldlanguagesvalues getFieldByIdAndLanguageByNavi(
- Long fieldvalues_id, Long language_id) {
- try {
- if (fieldvalues_id == null) {
- return null;
- }
-
- TypedQuery<Fieldlanguagesvalues> query = em
- .createQuery("select f from Fieldlanguagesvalues f WHERE f.language_id = :language_id AND f.fieldvalues_id = :fieldvalues_id", Fieldlanguagesvalues.class);
- query.setParameter("fieldvalues_id", fieldvalues_id);
- query.setParameter("language_id", language_id);
- Fieldlanguagesvalues flv = null;
- try {
- flv = performReplace(query.getSingleResult());
- } catch (NoResultException ex) {
- }
-
- FieldLanguage fieldLanguage = fieldLanguageDaoImpl
- .getFieldLanguageById(language_id);
-
- log.debug("Getting FieldById for Language "
- + fieldLanguage.getName());
-
- // Check for Right To Left Languages
- if (fieldLanguage.getRtl()) {
-
- log.debug("Language requieres RTL");
-
- Fieldlanguagesvalues remote = flv;
- 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);
-
- return toAdd;
- } else {
- log.debug("Language doesnt requiere RTL");
-
- return flv;
- }
-
- } catch (Exception ex2) {
- log.error("[getFieldByIdAndLanguage]: ", ex2);
- }
- return null;
- }
-
public String getString(Long fieldvalues_id, Long language_id) {
String result = null;
Fieldlanguagesvalues flv = getFieldByIdAndLanguage(fieldvalues_id, language_id);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/NaviBuilder.java Tue Sep 3 05:18:33 2013
@@ -37,14 +37,13 @@ import org.springframework.transaction.a
@Transactional
public class NaviBuilder {
- private static final Logger log = Red5LoggerFactory.getLogger(
- NaviBuilder.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(NaviBuilder.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
- private FieldManager fieldManager;
+ private FieldLanguagesValuesDao labelDao;
public Naviglobal getGlobalMenuEntry(long globalId) {
try {
@@ -55,21 +54,17 @@ public class NaviBuilder {
log.error("getGlobalMenuEntry", ex2);
}
return null;
-
+
}
-
+
public List<Naviglobal> getMainMenu(long user_level, long USER_ID, long language_id) {
List<Naviglobal> ll = getMainMenu(user_level, USER_ID);
for (Naviglobal navigl : ll) {
- navigl.setLabel(fieldManager.getFieldByIdAndLanguageByNavi(
- navigl.getFieldvalues_id(), language_id));
- navigl.setTooltip(fieldManager.getFieldByIdAndLanguageByNavi(
- navigl.getTooltip_fieldvalues_id(), language_id));
+ navigl.setLabel(labelDao.get(navigl.getFieldvalues_id(), language_id));
+ navigl.setTooltip(labelDao.get(navigl.getTooltip_fieldvalues_id(), language_id));
for (Navimain navim : navigl.getMainnavi()) {
- navim.setLabel(fieldManager.getFieldByIdAndLanguageByNavi(
- navim.getFieldvalues_id(), language_id));
- navim.setTooltip(fieldManager.getFieldByIdAndLanguageByNavi(
- navim.getTooltip_fieldvalues_id(), language_id));
+ navim.setLabel(labelDao.get(navim.getFieldvalues_id(), language_id));
+ navim.setTooltip(labelDao.get(navim.getTooltip_fieldvalues_id(), language_id));
}
}
return ll;
@@ -87,8 +82,7 @@ public class NaviBuilder {
return null;
}
- public void addGlobalStructure(String action, int naviorder,
- long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
+ public void addGlobalStructure(String action, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
String name, boolean deleted, Long tooltip_fieldvalues_id) {
try {
Naviglobal ng = new Naviglobal();
@@ -113,15 +107,13 @@ public class NaviBuilder {
}
}
- public void addMainStructure(String action, String params, int naviorder,
- long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, long global_id, boolean deleted,
- Long tooltip_fieldvalues_id) {
+ public void addMainStructure(String action, String params, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen,
+ long level_id, String name, long global_id, boolean deleted, Long tooltip_fieldvalues_id) {
try {
Naviglobal ng = getGlobalMenuEntry(global_id);
List<Navimain> mainEntries = ng.getMainnavi();
mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries;
-
+
Navimain nm = new Navimain();
nm.setAction(action);
nm.setParams(params);
@@ -137,10 +129,10 @@ public class NaviBuilder {
nm.setGlobal_id(global_id);
nm.setStarttime(new Date());
nm.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
-
+
mainEntries.add(nm);
ng.setMainnavi(mainEntries);
-
+
em.merge(ng);
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java Tue Sep 3 05:18:33 2013
@@ -872,7 +872,7 @@ public class UserManager {
// this is needed cause the language is not a needed data at
// registering
if (language_id != 0) {
- users.setLanguage_id(new Long(language_id));
+ users.setLanguage_id(language_id);
} else {
users.setLanguage_id(null);
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Tue Sep 3 05:18:33 2013
@@ -767,10 +767,8 @@ public class ImportInitvalues {
* @return
* @throws Exception
*/
- public static LinkedHashMap<Integer, LinkedHashMap<String, Object>> getLanguageFiles()
- throws Exception {
-
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> languages = new LinkedHashMap<Integer, LinkedHashMap<String, Object>>();
+ public static Map<Integer, Map<String, Object>> getLanguageFiles() throws Exception {
+ Map<Integer, Map<String, Object>> languages = new LinkedHashMap<Integer, Map<String, Object>>();
SAXReader reader = new SAXReader();
Document document = reader
@@ -830,28 +828,26 @@ public class ImportInitvalues {
}
public void loadLanguagesFile(int langId) throws Exception {
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> listlanguages = getLanguageFiles();
- loadLanguagesFile(listlanguages,
- new Hashtable<Long, Fieldvalues>(3000), langId);
+ Map<Integer, Map<String, Object>> listlanguages = getLanguageFiles();
+ loadLanguagesFile(listlanguages, new Hashtable<Long, Fieldvalues>(3000), langId);
}
public void loadLanguagesFile(String langName) throws Exception {
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> listlanguages = getLanguageFiles();
+ Map<Integer, Map<String, Object>> listlanguages = getLanguageFiles();
for (int langId : listlanguages.keySet()) {
- LinkedHashMap<String, Object> langMap = listlanguages.get(langId);
+ Map<String, Object> langMap = listlanguages.get(langId);
if (langName.equals(langMap.get("name"))) {
- loadLanguagesFile(listlanguages,
- new Hashtable<Long, Fieldvalues>(3000), langId);
+ loadLanguagesFile(listlanguages, new Hashtable<Long, Fieldvalues>(3000), langId);
break;
}
}
}
public void loadLanguagesFile(
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> listlanguages,
- Hashtable<Long, Fieldvalues> fieldCache, int langId)
+ Map<Integer, Map<String, Object>> listlanguages,
+ Map<Long, Fieldvalues> fieldCache, int langId)
throws Exception {
- LinkedHashMap<String, Object> langMap = listlanguages.get(langId);
+ Map<String, Object> langMap = listlanguages.get(langId);
log.debug("loadInitLanguages lang: " + langMap);
String langName = (String) langMap.get("name");
@@ -922,10 +918,9 @@ public class ImportInitvalues {
}
public void loadLanguagesFiles() throws Exception {
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> listlanguages = getLanguageFiles();
+ Map<Integer, Map<String, Object>> listlanguages = getLanguageFiles();
- Hashtable<Long, Fieldvalues> fieldCache = new Hashtable<Long, Fieldvalues>(
- 3000);
+ Map<Long, Fieldvalues> fieldCache = new Hashtable<Long, Fieldvalues>(3000);
/** Read all languages files */
for (int langId : listlanguages.keySet()) {
loadLanguagesFile(listlanguages, fieldCache, langId);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java Tue Sep 3 05:18:33 2013
@@ -41,13 +41,9 @@ import org.apache.openmeetings.persisten
@Entity
@NamedQueries({
- @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng "
- + "LEFT JOIN ng.mainnavi nm "
- + "WHERE nm.deleted = false "
- + "AND ng.level_id <= :level_id "
- + "AND nm.level_id <= :level_id "
- + "AND ng.deleted = false "
- + "order by ng.naviorder, nm.naviorder"),
+ @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng " + "LEFT JOIN ng.mainnavi nm "
+ + "WHERE nm.deleted = false " + "AND ng.level_id <= :level_id " + "AND nm.level_id <= :level_id "
+ + "AND ng.deleted = false " + "order by ng.naviorder, nm.naviorder"),
@NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.global_id = :global_id") })
@Table(name = "naviglobal")
public class Naviglobal implements Serializable {
@@ -57,54 +53,54 @@ public class Naviglobal implements Seria
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long global_id;
-
+
@Column(name = "name")
private String name;
-
+
@Column(name = "icon")
private String icon;
-
+
@Column(name = "isleaf")
private Boolean isleaf;
-
+
@Column(name = "isopen")
private Boolean isopen;
-
+
@Column(name = "action")
private String action;
-
+
@Column(name = "updatetime")
private Date updatetime;
-
+
@Column(name = "starttime")
private Date starttime;
-
+
@Column(name = "comment_field")
private String comment;
-
+
@Column(name = "naviorder")
private Integer naviorder;
-
+
@Column(name = "level_id")
private Long level_id;
-
+
@Column(name = "deleted")
private boolean deleted;
-
+
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
-
+
@Column(name = "tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
-
+
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "global_id")
@ForeignKey(enabled = true)
private List<Navimain> mainnavi;
-
+
@Transient
private Fieldlanguagesvalues label;
-
+
@Transient
private Fieldlanguagesvalues tooltip;
@@ -244,4 +240,10 @@ public class Naviglobal implements Seria
this.tooltip = tooltip;
}
+ @Override
+ public String toString() {
+ return "Naviglobal [global_id=" + global_id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
+ + deleted + ", fieldvalues_id=" + fieldvalues_id + ", tooltip_fieldvalues_id=" + tooltip_fieldvalues_id + "]";
+ }
+
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/basic/Navimain.java Tue Sep 3 05:18:33 2013
@@ -37,155 +37,160 @@ public class Navimain implements Seriali
private static final long serialVersionUID = 1691787896183701877L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long main_id;
-
- @Column(name="global_id")
- private Long global_id;
-
- @Column(name="name")
- private String name;
-
- @Column(name="icon")
- private String icon;
-
- @Column(name="isleaf")
- private Boolean isleaf;
-
- @Column(name="isopen")
- private Boolean isopen;
-
- @Column(name="action")
- private String action;
-
- @Column(name="params")
- private String params;
-
- @Column(name="updatetime")
- private Date updatetime;
-
- @Column(name="starttime")
- private Date starttime;
-
- @Column(name="comment_field")
- private String comment;
-
- @Column(name="naviorder")
- private Integer naviorder;
-
- @Column(name="level_id")
+ @Column(name = "id")
+ private Long main_id;
+
+ @Column(name = "global_id")
+ private Long global_id;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "icon")
+ private String icon;
+
+ @Column(name = "isleaf")
+ private Boolean isleaf;
+
+ @Column(name = "isopen")
+ private Boolean isopen;
+
+ @Column(name = "action")
+ private String action;
+
+ @Column(name = "params")
+ private String params;
+
+ @Column(name = "updatetime")
+ private Date updatetime;
+
+ @Column(name = "starttime")
+ private Date starttime;
+
+ @Column(name = "comment_field")
+ private String comment;
+
+ @Column(name = "naviorder")
+ private Integer naviorder;
+
+ @Column(name = "level_id")
private Long level_id;
-
- @Column(name="fieldvalues_id")
+
+ @Column(name = "fieldvalues_id")
private Long fieldvalues_id;
-
- @Column(name="deleted")
+
+ @Column(name = "deleted")
private boolean deleted;
-
+
@Transient
private Fieldlanguagesvalues label;
-
+
@Transient
private Fieldlanguagesvalues tooltip;
-
- @Column(name="tooltip_fieldvalues_id")
+
+ @Column(name = "tooltip_fieldvalues_id")
private Long tooltip_fieldvalues_id;
- public String getAction() {
- return action;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
+ public String getAction() {
+ return action;
+ }
+
+ public void setAction(String action) {
+ this.action = action;
+ }
+
public Long getLevel_id() {
return level_id;
}
+
public void setLevel_id(Long level_id) {
this.level_id = level_id;
}
-
+
public Long getGlobal_id() {
return global_id;
}
+
public void setGlobal_id(Long global_id) {
this.global_id = global_id;
}
-
- public String getComment() {
- return comment;
- }
-
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- public Long getMain_id() {
- return main_id;
- }
-
- public void setMain_id(Long main_id) {
- this.main_id = main_id;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public Boolean getIsleaf() {
- return isleaf;
- }
-
- public void setIsleaf(Boolean isleaf) {
- this.isleaf = isleaf;
- }
-
- public Boolean getIsopen() {
- return isopen;
- }
-
- public void setIsopen(Boolean isopen) {
- this.isopen = isopen;
- }
-
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public Long getMain_id() {
+ return main_id;
+ }
+
+ public void setMain_id(Long main_id) {
+ this.main_id = main_id;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public Boolean getIsleaf() {
+ return isleaf;
+ }
+
+ public void setIsleaf(Boolean isleaf) {
+ this.isleaf = isleaf;
+ }
+
+ public Boolean getIsopen() {
+ return isopen;
+ }
+
+ public void setIsopen(Boolean isopen) {
+ this.isopen = isopen;
+ }
+
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public boolean getDeleted() {
return deleted;
}
+
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
public Integer getNaviorder() {
return naviorder;
}
+
public void setNaviorder(Integer naviorder) {
this.naviorder = naviorder;
}
@@ -193,6 +198,7 @@ public class Navimain implements Seriali
public Long getFieldvalues_id() {
return fieldvalues_id;
}
+
public void setFieldvalues_id(Long fieldvalues_id) {
this.fieldvalues_id = fieldvalues_id;
}
@@ -200,13 +206,15 @@ public class Navimain implements Seriali
public Fieldlanguagesvalues getLabel() {
return label;
}
+
public void setLabel(Fieldlanguagesvalues label) {
this.label = label;
- }
+ }
public Long getTooltip_fieldvalues_id() {
return tooltip_fieldvalues_id;
}
+
public void setTooltip_fieldvalues_id(Long tooltip_fieldvalues_id) {
this.tooltip_fieldvalues_id = tooltip_fieldvalues_id;
}
@@ -214,6 +222,7 @@ public class Navimain implements Seriali
public Fieldlanguagesvalues getTooltip() {
return tooltip;
}
+
public void setTooltip(Fieldlanguagesvalues tooltip) {
this.tooltip = tooltip;
}
@@ -225,5 +234,11 @@ public class Navimain implements Seriali
public void setParams(String params) {
this.params = params;
}
-
+
+ @Override
+ public String toString() {
+ return "Navimain [main_id=" + main_id + ", global_id=" + global_id + ", name=" + name + ", action=" + action + ", params=" + params
+ + ", naviorder=" + naviorder + ", fieldvalues_id=" + fieldvalues_id + ", deleted=" + deleted + ", tooltip_fieldvalues_id="
+ + tooltip_fieldvalues_id + "]";
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java Tue Sep 3 05:18:33 2013
@@ -53,6 +53,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
+import org.apache.openmeetings.data.chat.ChatDao;
import org.apache.openmeetings.data.conference.PollManager;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
@@ -67,6 +68,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.persistence.beans.chat.ChatMessage;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
@@ -136,6 +138,8 @@ public class BackupExport {
private PollManager pollManager;
@Autowired
private ConfigurationDao configurationDao;
+ @Autowired
+ private ChatDao chatDao;
public void performExport(File filePath, File backup_dir,
boolean includeFiles) throws Exception {
@@ -338,6 +342,23 @@ public class BackupExport {
writeList(serializer, backup_dir, "configs.xml", "configs", list);
}
+ /*
+ * ##################### Chat
+ */
+ {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ Serializer serializer = new Persister(strategy);
+
+ registry.bind(User.class, UserConverter.class);
+ registry.bind(Room.class, RoomConverter.class);
+ List<ChatMessage> list = chatDao.get(0, Integer.MAX_VALUE);
+ if (list != null && list.size() > 0) {
+ registry.bind(list.get(0).getSent().getClass(), DateConverter.class);
+ }
+
+ writeList(serializer, backup_dir, "chat_messages.xml", "chat_messages", list);
+ }
if (includeFiles) {
/*
* ##################### Backup Room Files
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java Tue Sep 3 05:18:33 2013
@@ -67,6 +67,7 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
+import org.apache.openmeetings.data.chat.ChatDao;
import org.apache.openmeetings.data.conference.PollManager;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
@@ -85,6 +86,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
+import org.apache.openmeetings.persistence.beans.chat.ChatMessage;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
@@ -166,6 +168,8 @@ public class BackupImport {
private ConfigurationDao configurationDao;
@Autowired
private TimezoneUtil tzUtil;
+ @Autowired
+ private ChatDao chatDao;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
private final HashMap<Long, Long> organisationsMap = new HashMap<Long, Long>();
@@ -268,6 +272,7 @@ public class BackupImport {
* ##################### Import Users
*/
{
+ String jNameTimeZone = configurationDao.getConfValue("default.timezone", String.class, "Europe/Berlin");
List<User> list = readUserList(f, "users.xml", "users");
for (User u : list) {
if (u.getLogin() == null) {
@@ -278,8 +283,6 @@ public class BackupImport {
String tz = u.getTimeZoneId();
if (tz == null) {
- String jNameTimeZone = configurationDao.getConfValue(
- "default.timezone", String.class, "Europe/Berlin");
u.setTimeZoneId(jNameTimeZone);
u.setForceTimeZoneCheck(true);
} else {
@@ -353,7 +356,25 @@ public class BackupImport {
}
}
- log.info("Room organizations import complete, starting appointement import");
+ log.info("Room organizations import complete, starting chat messages import");
+ /*
+ * ##################### Import Chat messages
+ */
+ {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ Serializer serializer = new Persister(strategy);
+
+ registry.bind(User.class, new UserConverter(usersDao, usersMap));
+ registry.bind(Room.class, new RoomConverter(roomDao, roomsMap));
+
+ List<ChatMessage> list = readList(serializer, f, "chat_messages.xml", "chat_messages", ChatMessage.class, true);
+ for (ChatMessage m : list) {
+ chatDao.update(m);
+ }
+ }
+
+ log.info("Chat messages import complete, starting appointement import");
/*
* ##################### Import Appointements
*/
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/LangExport.java Tue Sep 3 05:18:33 2013
@@ -29,6 +29,7 @@ import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.dom4j.tree.FlyweightAttribute;
/**
*
@@ -72,9 +73,9 @@ public class LangExport {
public static Element createRoot(Document document) {
Element root = document.addElement("language");
- root.add(new Namespace("xsi",
- "http://www.w3.org/2001/XMLSchema-instance"));
- root.add(new Namespace("noNamespaceSchemaLocation", "language.xsd"));
+ Namespace xsi = new Namespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+ root.add(xsi);
+ root.add(new FlyweightAttribute("noNamespaceSchemaLocation", "language.xsd", xsi));
return root;
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Tue Sep 3 05:18:33 2013
@@ -26,8 +26,8 @@ import static org.apache.wicket.validati
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
@@ -490,8 +490,7 @@ public class InstallWizard extends Wizar
public LangDropDown(String id) throws Exception {
super(id);
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> allLanguagesAll
- = ImportInitvalues.getLanguageFiles();
+ Map<Integer, Map<String, Object>> allLanguagesAll = ImportInitvalues.getLanguageFiles();
List<SelectOption> list = new ArrayList<SelectOption>();
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20simplified.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml Tue Sep 3 05:18:33 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
<string id="1570" name="remindertype_iCal_email">
<value>iCal email</value>
</string>
+ <string id="1571" name="oauth2">
+ <value>OAuth2</value>
+ </string>
+ <string id="1572" name="oauth2">
+ <value>Manage OAuth2 configurations</value>
+ </string>
+ <string id="1573" name="oauth2">
+ <value>Name</value>
+ </string>
+ <string id="1574" name="oauth2">
+ <value>Enabled</value>
+ </string>
+ <string id="1575" name="oauth2">
+ <value>Icon URL</value>
+ </string>
+ <string id="1576" name="oauth2">
+ <value>client_id</value>
+ </string>
+ <string id="1577" name="oauth2">
+ <value>client_secret</value>
+ </string>
+ <string id="1578" name="oauth2">
+ <value>Request key URL</value>
+ </string>
+ <string id="1579" name="oauth2">
+ <value>Request token URL</value>
+ </string>
+ <string id="1580" name="oauth2">
+ <value>Request info URL</value>
+ </string>
+ <string id="1581" name="oauth2">
+ <value>OAuth2 config</value>
+ </string>
+ <string id="1582" name="oauth2">
+ <value>Login param name</value>
+ </string>
+ <string id="1583" name="oauth2">
+ <value>Email param name</value>
+ </string>
+ <string id="1584" name="oauth2">
+ <value>Firstname param name</value>
+ </string>
+ <string id="1585" name="oauth2">
+ <value>Lastname param name</value>
+ </string>
+ <string id="1586" name="oauth2">
+ <value>Request token attributes</value>
+ </string>
+ <string id="1587" name="oauth2">
+ <value>Redirect uri</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20traditional.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml Tue Sep 3 05:18:33 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
<string id="1570" name="remindertype_iCal_email">
<value>iCal email</value>
</string>
+ <string id="1571" name="oauth2">
+ <value>OAuth2</value>
+ </string>
+ <string id="1572" name="oauth2">
+ <value>Manage OAuth2 configurations</value>
+ </string>
+ <string id="1573" name="oauth2">
+ <value>Name</value>
+ </string>
+ <string id="1574" name="oauth2">
+ <value>Enabled</value>
+ </string>
+ <string id="1575" name="oauth2">
+ <value>Icon URL</value>
+ </string>
+ <string id="1576" name="oauth2">
+ <value>client_id</value>
+ </string>
+ <string id="1577" name="oauth2">
+ <value>client_secret</value>
+ </string>
+ <string id="1578" name="oauth2">
+ <value>Request key URL</value>
+ </string>
+ <string id="1579" name="oauth2">
+ <value>Request token URL</value>
+ </string>
+ <string id="1580" name="oauth2">
+ <value>Request info URL</value>
+ </string>
+ <string id="1581" name="oauth2">
+ <value>OAuth2 config</value>
+ </string>
+ <string id="1582" name="oauth2">
+ <value>Login param name</value>
+ </string>
+ <string id="1583" name="oauth2">
+ <value>Email param name</value>
+ </string>
+ <string id="1584" name="oauth2">
+ <value>Firstname param name</value>
+ </string>
+ <string id="1585" name="oauth2">
+ <value>Lastname param name</value>
+ </string>
+ <string id="1586" name="oauth2">
+ <value>Request token attributes</value>
+ </string>
+ <string id="1587" name="oauth2">
+ <value>Redirect uri</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml Tue Sep 3 05:18:33 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
<string id="1570" name="remindertype_iCal_email">
<value>iCal email</value>
</string>
+ <string id="1571" name="oauth2">
+ <value>OAuth2</value>
+ </string>
+ <string id="1572" name="oauth2">
+ <value>Manage OAuth2 configurations</value>
+ </string>
+ <string id="1573" name="oauth2">
+ <value>Name</value>
+ </string>
+ <string id="1574" name="oauth2">
+ <value>Enabled</value>
+ </string>
+ <string id="1575" name="oauth2">
+ <value>Icon URL</value>
+ </string>
+ <string id="1576" name="oauth2">
+ <value>client_id</value>
+ </string>
+ <string id="1577" name="oauth2">
+ <value>client_secret</value>
+ </string>
+ <string id="1578" name="oauth2">
+ <value>Request key URL</value>
+ </string>
+ <string id="1579" name="oauth2">
+ <value>Request token URL</value>
+ </string>
+ <string id="1580" name="oauth2">
+ <value>Request info URL</value>
+ </string>
+ <string id="1581" name="oauth2">
+ <value>OAuth2 config</value>
+ </string>
+ <string id="1582" name="oauth2">
+ <value>Login param name</value>
+ </string>
+ <string id="1583" name="oauth2">
+ <value>Email param name</value>
+ </string>
+ <string id="1584" name="oauth2">
+ <value>Firstname param name</value>
+ </string>
+ <string id="1585" name="oauth2">
+ <value>Lastname param name</value>
+ </string>
+ <string id="1586" name="oauth2">
+ <value>Request token attributes</value>
+ </string>
+ <string id="1587" name="oauth2">
+ <value>Redirect uri</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml Tue Sep 3 05:18:33 2013
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -25,7 +26,7 @@ to add new Languages or modify/customize
see http://openmeetings.apache.org/LanguageEditor.html for Details
###############################################-->
<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="language.xsd">
- <string id="1" name="conference">
+ <string id="1" name="conference">
<value>Konferencia</value>
</string>
<string id="2" name="meeting">
@@ -923,7 +924,7 @@ see http://openmeetings.apache.org/Langu
<value>Személyes tartalmak</value>
</string>
<string id="300" name="subnavi">
- <value></value>
+ <value></value>
</string>
<string id="301" name="conferencebar">
<value>Moderálás</value>
@@ -2084,7 +2085,7 @@ see http://openmeetings.apache.org/Langu
<value>Hozzáférést kérek a táblához</value>
</string>
<string id="687" name="event user list">
- <value>Audio/Video hozzáférést kérek</value>
+ <value>Audio/Video hozzáférést kérek</value>
</string>
<string id="688" name="event user list">
<value>Moderátori jogot kaptál</value>
@@ -2108,7 +2109,7 @@ see http://openmeetings.apache.org/Langu
<value>tábla használatához. Kattintson a névre és a rajztábla ikonra a tábla használatának hozzáadásához, visszavételéhez.</value>
</string>
<string id="695" name="695">
- <value>Audio/Video hozzáféréséhez. Kattintson a nevére és a Mikrofon/Kamera ikonra a hozzászólás engedélyezéséhez, visszavételéhez.</value>
+ <value>Audio/Video hozzáféréséhez. Kattintson a nevére és a Mikrofon/Kamera ikonra a hozzászólás engedélyezéséhez, visszavételéhez.</value>
</string>
<string id="696" name="moderation message">
<value>Várjon amég a Moderátor belép a terembe.</value>
@@ -2843,7 +2844,7 @@ see http://openmeetings.apache.org/Langu
<value>Licenc beállÃtások</value>
</string>
<string id="940" name="user-license">
- <value>Vásároljon idÅhosszabbÃtást a konferenciához (Pay-per-minute).<br/><br/> vagy vásároljon feltöltést 3-12 hónapot.<br/><br/>Küldjön meghÃvókat (direkt linkek a konferencia terembÅl) vagy készÃtsen webkonferenciákat a naptárral együtt a külsÅ felhasználók csak elÅfizetéssel férhetnek hozzá!</value>
+ <value>Vásároljon idÅhosszabbÃtást a konferenciához (Pay-per-minute).<br/><br/> vagy vásároljon feltöltést 3-12 hónapot.<br/><br/>Küldjön meghÃvókat (direkt linkek a konferencia terembÅl) vagy készÃtsen webkonferenciákat a naptárral együtt a külsÅ felhasználók csak elÅfizetéssel férhetnek hozzá!</value>
</string>
<string id="941" name="user-license">
<value>60 perc vásárlása 9,99 EURO (16 Cent per Minute)</value>
@@ -3029,7 +3030,7 @@ see http://openmeetings.apache.org/Langu
<value>SIP-BeállÃtások</value>
</string>
<string id="1002" name="room-admin">
- <value>A konferencia száma és PIN kódja automatikusan létrehozva az OpenXG RPC-Ãtjáróval</value>
+ <value>A konferencia száma és PIN kódja automatikusan létrehozva az OpenXG RPC-Ãtjáróval</value>
</string>
<string id="1003" name="room-admin">
<value>SIP AzonosÃtó</value>
@@ -3317,7 +3318,7 @@ see http://openmeetings.apache.org/Langu
<value>ElÅadás lezárása!</value>
</string>
<string id="1098" name="keyboard-input">
- <value>Ez az elÅadás lezárásra került, átirányÃtás. </value>
+ <value>Ez az elÅadás lezárásra került, átirányÃtás.</value>
</string>
<string id="1099" name="room config">
<value>Szoba lezárása</value>
@@ -3488,7 +3489,7 @@ see http://openmeetings.apache.org/Langu
<value>Vége:</value>
</string>
<string id="1155" name="calendar invitation message">
- <value>Változás $APP_NAME konferencia:</value>
+ <value>Változás $APP_NAME konferencia:</value>
</string>
<string id="1156" name="calendar invitation message">
<value>Szervezet:</value>
@@ -3515,7 +3516,7 @@ see http://openmeetings.apache.org/Langu
<value>ÃrdeklÅdésem</value>
</string>
<string id="1164" name="user settings">
-<value>Név</value>
+ <value>Név</value>
</string>
<string id="1165" name="user settings">
<value>IdÅzóna</value>
@@ -3623,7 +3624,7 @@ see http://openmeetings.apache.org/Langu
<value></value>
</string>
<string id="1200" name="chat log icon">
- <value>Chat napló Mutat / Másol </value>
+ <value>Chat napló Mutat / Másol</value>
</string>
<string id="1201" name="chat log window">
<value>Chat napló</value>
@@ -3899,7 +3900,7 @@ see http://openmeetings.apache.org/Langu
<value>Ok</value>
</string>
<string id="1292" name="nick name">
- <value>Legalább 4 karakter szükséges! Esetleg a vezeték és keresztnév.</value>
+ <value>Legalább 4 karakter szükséges! Esetleg a vezeték és keresztnév.</value>
</string>
<string id="1293" name="nick name">
<value>Ãrvényes e-mail cÃmet adjon meg!</value>
@@ -4786,4 +4787,4 @@ see http://openmeetings.apache.org/Langu
<string id="1587" name="oauth2">
<value>Redirect uri</value>
</string>
-</language>
\ No newline at end of file
+</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml Tue Sep 3 05:18:33 2013
@@ -18,8 +18,7 @@
under the License.
-->
-<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="languages.xsd">
+<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="languages.xsd">
<lang id="1" rightToLeft="false" code="en">english</lang>
<lang id="2" rightToLeft="false" code="de">deutsch</lang>
<lang id="3" rightToLeft="false" code="de-StudIP">deutsch (studIP)</lang>
@@ -37,19 +36,19 @@
<lang id="15" rightToLeft="false" code="ja">japanese</lang>
<lang id="16" rightToLeft="false" code="id">indonesian</lang>
<lang id="17" rightToLeft="false" code="hu">hungarian</lang>
- <lang id="18" rightToLeft="false" code="tr">turkish</lang>
- <lang id="19" rightToLeft="false" code="uk">ukrainian</lang>
- <lang id="20" rightToLeft="false" code="th">thai</lang>
- <lang id="21" rightToLeft="false" code="fa">persian</lang>
- <lang id="22" rightToLeft="false" code="cs">czech</lang>
- <lang id="23" rightToLeft="false" code="gl">galician</lang>
- <lang id="24" rightToLeft="false" code="fi">finnish</lang>
- <lang id="25" rightToLeft="false" code="pl">polish</lang>
- <lang id="26" rightToLeft="false" code="el">greek</lang>
- <lang id="27" rightToLeft="false" code="nl">dutch</lang>
- <lang id="28" rightToLeft="true" code="he">hebrew</lang>
- <lang id="29" rightToLeft="false" code="ca">catalan</lang>
- <lang id="30" rightToLeft="false" code="bg">bulgarian</lang>
- <lang id="31" rightToLeft="false" code="da">danish</lang>
- <lang id="32" rightToLeft="false" code="sk">slovak</lang>
+ <lang id="18" rightToLeft="false" code="tr">turkish</lang>
+ <lang id="19" rightToLeft="false" code="uk">ukrainian</lang>
+ <lang id="20" rightToLeft="false" code="th">thai</lang>
+ <lang id="21" rightToLeft="false" code="fa">persian</lang>
+ <lang id="22" rightToLeft="false" code="cs">czech</lang>
+ <lang id="23" rightToLeft="false" code="gl">galician</lang>
+ <lang id="24" rightToLeft="false" code="fi">finnish</lang>
+ <lang id="25" rightToLeft="false" code="pl">polish</lang>
+ <lang id="26" rightToLeft="false" code="el">greek</lang>
+ <lang id="27" rightToLeft="false" code="nl">dutch</lang>
+ <lang id="28" rightToLeft="true" code="he">hebrew</lang>
+ <lang id="29" rightToLeft="false" code="ca">catalan</lang>
+ <lang id="30" rightToLeft="false" code="bg">bulgarian</lang>
+ <lang id="31" rightToLeft="false" code="da">danish</lang>
+ <lang id="32" rightToLeft="false" code="sk">slovak</lang>
</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues%20brazil.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml Tue Sep 3 05:18:33 2013
@@ -4736,4 +4736,55 @@ see http://openmeetings.apache.org/Langu
<string id="1570" name="remindertype_iCal_email">
<value>iCal email</value>
</string>
+ <string id="1571" name="oauth2">
+ <value>OAuth2</value>
+ </string>
+ <string id="1572" name="oauth2">
+ <value>Manage OAuth2 configurations</value>
+ </string>
+ <string id="1573" name="oauth2">
+ <value>Name</value>
+ </string>
+ <string id="1574" name="oauth2">
+ <value>Enabled</value>
+ </string>
+ <string id="1575" name="oauth2">
+ <value>Icon URL</value>
+ </string>
+ <string id="1576" name="oauth2">
+ <value>client_id</value>
+ </string>
+ <string id="1577" name="oauth2">
+ <value>client_secret</value>
+ </string>
+ <string id="1578" name="oauth2">
+ <value>Request key URL</value>
+ </string>
+ <string id="1579" name="oauth2">
+ <value>Request token URL</value>
+ </string>
+ <string id="1580" name="oauth2">
+ <value>Request info URL</value>
+ </string>
+ <string id="1581" name="oauth2">
+ <value>OAuth2 config</value>
+ </string>
+ <string id="1582" name="oauth2">
+ <value>Login param name</value>
+ </string>
+ <string id="1583" name="oauth2">
+ <value>Email param name</value>
+ </string>
+ <string id="1584" name="oauth2">
+ <value>Firstname param name</value>
+ </string>
+ <string id="1585" name="oauth2">
+ <value>Lastname param name</value>
+ </string>
+ <string id="1586" name="oauth2">
+ <value>Request token attributes</value>
+ </string>
+ <string id="1587" name="oauth2">
+ <value>Redirect uri</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml Tue Sep 3 05:18:33 2013
@@ -4787,55 +4787,4 @@ see http://openmeetings.apache.org/Langu
<string id="1587" name="oauth2">
<value>Redirect uri</value>
</string>
- <string id="1571" name="oauth2">
- <value>OAuth2</value>
- </string>
- <string id="1572" name="oauth2">
- <value>Manage OAuth2 configurations</value>
- </string>
- <string id="1573" name="oauth2">
- <value>Name</value>
- </string>
- <string id="1574" name="oauth2">
- <value>Enabled</value>
- </string>
- <string id="1575" name="oauth2">
- <value>Icon URL</value>
- </string>
- <string id="1576" name="oauth2">
- <value>client_id</value>
- </string>
- <string id="1577" name="oauth2">
- <value>client_secret</value>
- </string>
- <string id="1578" name="oauth2">
- <value>Request key URL</value>
- </string>
- <string id="1579" name="oauth2">
- <value>Request token URL</value>
- </string>
- <string id="1580" name="oauth2">
- <value>Request info URL</value>
- </string>
- <string id="1581" name="oauth2">
- <value>OAuth2 config</value>
- </string>
- <string id="1582" name="oauth2">
- <value>Login param name</value>
- </string>
- <string id="1583" name="oauth2">
- <value>Email param name</value>
- </string>
- <string id="1584" name="oauth2">
- <value>Firstname param name</value>
- </string>
- <string id="1585" name="oauth2">
- <value>Lastname param name</value>
- </string>
- <string id="1586" name="oauth2">
- <value>Request token attributes</value>
- </string>
- <string id="1587" name="oauth2">
- <value>Redirect uri</value>
- </string>
</language>
Modified: openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml?rev=1519559&r1=1519558&r2=1519559&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml Tue Sep 3 05:18:33 2013
@@ -91,6 +91,7 @@
<div class="xmlcode">
-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.jar
-Dom.home=${workspace_loc:Openmeetings}/src/main/webapp
+ -Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups
</div>
</li>
<li>To avoid temporary files being created in OM root, modify