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 2014/08/25 09:20:08 UTC
svn commit: r1620268 - in /openmeetings: branches/3.0.x/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/
branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/
branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/o...
Author: solomax
Date: Mon Aug 25 07:20:07 2014
New Revision: 1620268
URL: http://svn.apache.org/r1620268
Log:
[OPENMEETINGS-980] library versions were updated to latest releases; build is fixed; compilation warnings are partially fixed
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/DataViewContainer.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
Modified: openmeetings/branches/3.0.x/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Mon Aug 25 07:20:07 2014
@@ -131,7 +131,7 @@
<pathelement path="${main.out.dir}" />
</path>
- <target name="info" unless="java6.installed">
+ <target name="info" unless="java7.installed">
<echo>Ant version is ${ant.version}</echo> <!-- output Ant version -->
</target>
@@ -1266,6 +1266,7 @@
<fileset dir="${om.lib.dir}" includes="httpcore-jar*.jar" />
<fileset dir="${om.lib.dir}" includes="httpclient-jar*.jar" />
<fileset dir="${om.lib.dir}" includes="slf4j-api*.jar" />
+ <fileset dir="${om.lib.dir}" includes="stax-api-jar-1.0.jar" />
<fileset dir="${om.lib.dir}" includes="*-source*.jar" />
<fileset dir="${om.lib.dir}" includes="*-javadoc*.jar" />
</delete>
@@ -1417,17 +1418,18 @@
<antcall target="-process-db" inheritAll="true" inheritRefs="true" />
</target>
- <target name="-java7.check" unless="java6.installed" depends="info">
+ <target name="-java7.check" unless="java7.installed" depends="info">
<condition property="java7.installed" value="true">
<and>
<or>
<equals arg1="${java.specification.version}" arg2="1.7" />
+ <equals arg1="${java.specification.version}" arg2="1.8" />
</or>
<matches string="${java.vm.specification.vendor}" pattern=".*[sun,oracle].*" casesensitive="false" singleline="true" />
</and>
</condition>
<echo message="Using Java ${java.version} specification: ${java.specification.version}" />
- <fail message="Unsupported Java version - detected: ${java.version} Only Sun/Oracle Java compiler version 7 supported.">
+ <fail message="Unsupported Java version - detected: ${java.version} Only Sun/Oracle Java compiler version 7 or 8 are supported.">
<condition>
<not>
<equals arg1="${java7.installed}" arg2="true" />
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Mon Aug 25 07:20:07 2014
@@ -302,7 +302,7 @@
<dependency org="com.googlecode.jsmpp" name="jsmpp" rev="2.1.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.smslib" name="smslib" rev="3.5.3" conf="openmeetings->*" transitive="false">
+ <dependency org="org.smslib" name="smslib" rev="3.5.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.asteriskjava" name="asterisk-java" rev="1.0.0.CI-20130102.214528-1134" conf="openmeetings->*" transitive="false">
@@ -316,10 +316,19 @@
<include type="jar" />
</dependency>
<!-- BEGIN openjpa -->
+ <dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.1.1" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
<dependency org="net.sourceforge.serp" name="serp" rev="1.14.1" conf="openmeetings->*" transitive="false" >
<include type="jar" />
</dependency>
<dependency org="org.apache.xbean" name="xbean-asm4-shaded" rev="3.14" conf="openmeetings->*" transitive="false" />
+ <dependency org="org.apache.openjpa" name="openjpa-jdbc" rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.openjpa" name="openjpa-jest" rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
<dependency org="org.apache.openjpa" name="openjpa-kernel" rev="2.3.0" conf="openmeetings->*" transitive="false" >
<include type="jar" />
</dependency>
@@ -332,12 +341,13 @@
<dependency org="org.apache.openjpa" name="openjpa-persistence-jdbc" rev="2.3.0" conf="openmeetings->*" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.openjpa" name="openjpa-jdbc" rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <dependency org="org.apache.openjpa" name="openjpa-slice" rev="2.3.0" conf="openmeetings->*" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.openjpa" name="openjpa" rev="2.3.0" conf="openmeetings->*" transitive="false" >
+ <dependency org="org.apache.openjpa" name="openjpa-xmlstore" rev="2.3.0" conf="openmeetings->*" transitive="false" >
<include type="jar" />
</dependency>
+ <dependency org="org.apache.openjpa" name="openjpa" rev="2.3.0" conf="openmeetings->*" transitive="false" />
<!-- END openjpa -->
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5" conf="openmeetings.ext->*" transitive="false"/>
@@ -436,6 +446,9 @@
<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.mina" module="mina-core" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="com.ibm.websphere" module="websphere_uow_api" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="commons-pool" module="commons-pool" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="org.apache.commons" module="commons-lang3" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java Mon Aug 25 07:20:07 2014
@@ -54,7 +54,7 @@ import org.apache.openmeetings.db.entity
, @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/branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/basic/FieldManager.java Mon Aug 25 07:20:07 2014
@@ -68,40 +68,13 @@ public class FieldManager {
public String getString(Long fieldvalues_id, Long language_id) {
String result = null;
- Fieldlanguagesvalues flv = getFieldByIdAndLanguage(fieldvalues_id, language_id);
+ Fieldlanguagesvalues flv = fieldLanguagesValuesDAO.get(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 {
@@ -219,7 +192,7 @@ public class FieldManager {
Fieldlanguagesvalues toAdd = new Fieldlanguagesvalues();
toAdd.setFieldlanguagesvalues_id(remote
.getFieldlanguagesvalues_id());
- toAdd.setFieldvalues_id(remote.getFieldvalues_id());
+ toAdd.setFieldvalues(remote.getFieldvalues());
toAdd.setLanguage_id(remote.getLanguage_id());
String[] splitted = remote.getValue().split(" ");
@@ -332,7 +305,7 @@ public class FieldManager {
Fieldlanguagesvalues r = new Fieldlanguagesvalues();
r.setDeleted(f.getDeleted());
r.setFieldlanguagesvalues_id(f.getFieldlanguagesvalues_id());
- r.setFieldvalues_id(f.getFieldvalues_id());
+ r.setFieldvalues(f.getFieldvalues());
r.setLanguage_id(f.getLanguage_id());
r.setStarttime(f.getStarttime());
r.setUpdatetime(f.getUpdatetime());
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Mon Aug 25 07:20:07 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.servlet.
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.io.FileFilter;
@@ -54,8 +55,7 @@ import org.springframework.web.bind.anno
@Controller
public class ScreenController {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenController.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ScreenController.class, webAppRootKey);
@Autowired
private ISessionManager sessionManager;
Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Aug 25 07:20:07 2014
@@ -18,13 +18,21 @@
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:mvc="http://www.springframework.org/schema/mvc"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
+ >
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
<property name="persistenceUnitName" value="openmeetings" />
</bean>
@@ -212,11 +220,11 @@
<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="triggers">
<list>
- <ref local="triggerSessionClear" />
- <ref local="triggerMeetingReminder" />
- <ref local="triggerTestSetupCleanup" />
- <ref local="triggerResetSendingMailStatus" />
- <ref local="triggerSendMails" />
+ <ref bean="triggerSessionClear" />
+ <ref bean="triggerMeetingReminder" />
+ <ref bean="triggerTestSetupCleanup" />
+ <ref bean="triggerResetSendingMailStatus" />
+ <ref bean="triggerSendMails" />
</list>
</property>
</bean>
Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/spring-mvc-servlet.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/spring-mvc-servlet.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/spring-mvc-servlet.xml Mon Aug 25 07:20:07 2014
@@ -20,6 +20,5 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
/>
-
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java Mon Aug 25 07:20:07 2014
@@ -162,7 +162,6 @@ public class FillLabels extends Abstract
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.setName(fieldName);
@@ -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/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Mon Aug 25 07:20:07 2014
@@ -50,7 +50,6 @@ public class ConfigsPanel extends AdminP
target.appendJavaScript("omConfigPanelInit();");
}
- @SuppressWarnings("unchecked")
public ConfigsPanel(String id) {
super(id);
@@ -88,10 +87,10 @@ public class ConfigsPanel extends AdminP
}
};
DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container)
- , new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container)
- , new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Configuration>("orderById", "configuration_id", container))
+ .addLink(new OmOrderByBorder<Configuration>("orderByKey", "conf_key", container))
+ .addLink(new OmOrderByBorder<Configuration>("orderByValue", "conf_value", container));
+ add(container.getLinks());
add(navigator);
form = new ConfigForm("form", listContainer, new Configuration());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Mon Aug 25 07:20:07 2014
@@ -51,7 +51,6 @@ public class GroupsPanel extends AdminPa
target.appendJavaScript("groupsInit();");
}
- @SuppressWarnings("unchecked")
public GroupsPanel(String id) {
super(id);
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
@@ -96,9 +95,9 @@ public class GroupsPanel extends AdminPa
}
};
DataViewContainer<Organisation> container = new DataViewContainer<Organisation>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Organisation>("orderById", "organisation_id", container)
- , new OmOrderByBorder<Organisation>("orderByName", "name", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Organisation>("orderById", "organisation_id", container))
+ .addLink(new OmOrderByBorder<Organisation>("orderByName", "name", container));
+ add(container.getLinks());
add(navigator);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Mon Aug 25 07:20:07 2014
@@ -90,7 +90,6 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
- @SuppressWarnings("unchecked")
public LangPanel(String id) {
super(id);
// Create feedback panels
@@ -143,8 +142,8 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"
- + (fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues_id()) ? " ui-state-active" : "")));
+ Long formFvId = form.getModelObject().getFieldvalues() == null ? null : form.getModelObject().getFieldvalues().getFieldvalues_id();
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content" + (fv.getFieldvalues_id().equals(formFvId) ? " ui-state-active" : "")));
}
};
@@ -160,10 +159,10 @@ public class LangPanel extends AdminPane
}
};
DataViewContainer<Fieldvalues> container = new DataViewContainer<Fieldvalues>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container)
- , new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container)
- , new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Fieldvalues>("orderById", "fieldvalues.fieldvalues_id", container))
+ .addLink(new OmOrderByBorder<Fieldvalues>("orderByName", "fieldvalues.name", container))
+ .addLink(new OmOrderByBorder<Fieldvalues>("orderByValue", "value", container));
+ add(container.getLinks());
add(navigator);
langForm = new LangForm("langForm", listContainer, this);
fileUploadField = new FileUploadField("fileInput");
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Mon Aug 25 07:20:07 2014
@@ -50,7 +50,6 @@ public class LdapsPanel extends AdminPan
target.appendJavaScript("omLdapPanelInit();");
}
- @SuppressWarnings("unchecked")
public LdapsPanel(String id) {
super(id);
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
@@ -87,10 +86,10 @@ public class LdapsPanel extends AdminPan
}
};
DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container)
- , new OmOrderByBorder<LdapConfig>("orderByName", "name", container)
- , new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "ldapConfigId", container))
+ .addLink(new OmOrderByBorder<LdapConfig>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ add(container.getLinks());
add(navigator);
form = new LdapForm("form", listContainer, new LdapConfig());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Mon Aug 25 07:20:07 2014
@@ -38,7 +38,6 @@ public class OAuthPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private OAuthForm form;
- @SuppressWarnings("unchecked")
public OAuthPanel(String id) {
super(id);
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
@@ -79,9 +78,9 @@ public class OAuthPanel extends AdminPan
}
};
DataViewContainer<OAuthServer> container = new DataViewContainer<OAuthServer>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<OAuthServer>("orderById", "oauthServerId", container),
- new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "oauthServerId", container))
+ .addLink(new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
+ add(container.getLinks());
add(navigator);
form = new OAuthForm("form", listContainer, new OAuthServer());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Mon Aug 25 07:20:07 2014
@@ -46,7 +46,6 @@ public class RoomsPanel extends AdminPan
target.appendJavaScript("omRoomPanelInit();");
}
- @SuppressWarnings("unchecked")
public RoomsPanel(String id) {
super(id);
SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableDataProvider<Room>(RoomDao.class)) {
@@ -85,10 +84,10 @@ public class RoomsPanel extends AdminPan
}
};
DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Room>("orderById", "rooms_id", container)
- , new OmOrderByBorder<Room>("orderByName", "name", container)
- , new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Room>("orderById", "rooms_id", container))
+ .addLink(new OmOrderByBorder<Room>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
+ add(container.getLinks());
add(navigator);
add(form = new RoomForm("form", listContainer, new Room()));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Mon Aug 25 07:20:07 2014
@@ -50,7 +50,6 @@ public class ServersPanel extends AdminP
target.appendJavaScript("omServerPanelInit();");
}
- @SuppressWarnings("unchecked")
public ServersPanel(String id) {
super(id);
SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList",
@@ -88,10 +87,10 @@ public class ServersPanel extends AdminP
}
};
DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<Server>("orderById", "id", container)
- , new OmOrderByBorder<Server>("orderByName", "name", container)
- , new OmOrderByBorder<Server>("orderByAddress", "address", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<Server>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<Server>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ add(container.getLinks());
add(navigator);
form = new ServerForm("form", listContainer, new Server());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Mon Aug 25 07:20:07 2014
@@ -60,7 +60,6 @@ public class UsersPanel extends AdminPan
private UserForm form;
- @SuppressWarnings("unchecked")
public UsersPanel(String id) {
super(id);
@@ -98,11 +97,11 @@ public class UsersPanel extends AdminPan
}
};
DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView, navigator);
- container.setLinks(new OmOrderByBorder<User>("orderById", "user_id", container)
- , new OmOrderByBorder<User>("orderByLogin", "login", container)
- , new OmOrderByBorder<User>("orderByFirstName", "firstname", container)
- , new OmOrderByBorder<User>("orderByLastName", "lastname", container));
- add(container.orderLinks);
+ container.addLink(new OmOrderByBorder<User>("orderById", "user_id", container))
+ .addLink(new OmOrderByBorder<User>("orderByLogin", "login", container))
+ .addLink(new OmOrderByBorder<User>("orderByFirstName", "firstname", container))
+ .addLink(new OmOrderByBorder<User>("orderByLastName", "lastname", container));
+ add(container.getLinks());
add(navigator);
UserDao usersDaoImpl = getBean(UserDao.class);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/DataViewContainer.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/DataViewContainer.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/DataViewContainer.java Mon Aug 25 07:20:07 2014
@@ -19,6 +19,8 @@
package org.apache.openmeetings.web.data;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.web.admin.SearchableDataView;
@@ -30,7 +32,7 @@ public class DataViewContainer<T extends
public WebMarkupContainer container;
public SearchableDataView<T> view;
public PagedEntityListPanel navigator;
- public OmOrderByBorder<T>[] orderLinks;
+ private List<OmOrderByBorder<T>> orderLinks = new ArrayList<OmOrderByBorder<T>>();
public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view, PagedEntityListPanel navigator) {
this.container = container;
@@ -38,8 +40,14 @@ public class DataViewContainer<T extends
this.navigator = navigator;
}
- //TODO refactor to remove warnings
- public void setLinks(OmOrderByBorder<T>... orderLinks) {
- this.orderLinks = orderLinks;
+ public DataViewContainer<T> addLink(OmOrderByBorder<T> link) {
+ orderLinks.add(link);
+ return this;
+ }
+
+ public OmOrderByBorder<T>[] getLinks() {
+ @SuppressWarnings("unchecked")
+ OmOrderByBorder<T>[] a = new OmOrderByBorder[0];
+ return orderLinks.toArray(a);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java Mon Aug 25 07:20:07 2014
@@ -40,7 +40,7 @@ public class OmOrderByBorder<T extends I
@Override
protected void onAjaxClick(AjaxRequestTarget target) {
target.add(container.container, container.navigator);
- target.add(container.orderLinks);
+ target.add(container.getLinks());
}
static class SortIconCssProvider extends CssProvider<String> {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Mon Aug 25 07:20:07 2014
@@ -204,7 +204,7 @@ public class MessagesContactsPanel exten
updateTable(target);
target.add(folders, unread, selectDropDown, moveDropDown);
target.add(dataContainer.container, dataContainer.navigator);
- target.add(dataContainer.orderLinks);
+ target.add(dataContainer.getLinks());
}
}
@@ -236,7 +236,6 @@ public class MessagesContactsPanel exten
}
}
- @SuppressWarnings("unchecked")
public MessagesContactsPanel(String id) {
super(id);
NOT_MOVE_FOLDER.setPrivateMessageFolderId(MOVE_CHOOSE);
@@ -419,11 +418,11 @@ public class MessagesContactsPanel exten
}
};
dataContainer = new DataViewContainer<PrivateMessage>(container, dv, navigator);
- dataContainer.setLinks(new OmOrderByBorder<PrivateMessage>("orderById", "id", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer)
- , new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
- add(dataContainer.orderLinks);
+ dataContainer.addLink(new OmOrderByBorder<PrivateMessage>("orderById", "id", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer))
+ .addLink(new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
+ add(dataContainer.getLinks());
add(navigator);
add(unread.setOutputMarkupId(true));
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Mon Aug 25 07:20:07 2014
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<velocity.version>1.7</velocity.version>
- <smslib.version>3.5.3</smslib.version> <!-- 3.5.4 requires Java7 -->
+ <smslib.version>3.5.4</smslib.version>
<derby.version>10.10.1.1</derby.version>
</properties>
<repositories>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Aug 25 07:20:07 2014
@@ -25,12 +25,14 @@
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:jaxws="http://cxf.apache.org/jaxws"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"
+ >
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
<property name="persistenceUnitName" value="openmeetings" />
</bean>
@@ -214,11 +216,11 @@
<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="triggers">
<list>
- <ref local="triggerSessionClear" />
- <ref local="triggerMeetingReminder" />
- <ref local="triggerTestSetupCleanup" />
- <ref local="triggerResetSendingMailStatus" />
- <ref local="triggerSendMails" />
+ <ref bean="triggerSessionClear" />
+ <ref bean="triggerMeetingReminder" />
+ <ref bean="triggerTestSetupCleanup" />
+ <ref bean="triggerResetSendingMailStatus" />
+ <ref bean="triggerSendMails" />
</list>
</property>
</bean>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml?rev=1620268&r1=1620267&r2=1620268&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml Mon Aug 25 07:20:07 2014
@@ -20,6 +20,5 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
/>
-