Author: solomax
Date: Sun Feb 23 12:27:32 2014
New Revision: 1571003
URL: http://svn.apache.org/r1571003
Log:
[OPENMEETINGS-902] import of FlvRecordingMetaData is fixed
Modified:
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1571003&r1=1571002&r2=1571003&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Sun Feb 23 12:27:32 2014
@@ -180,7 +180,7 @@
<dependency org="org.apache.derby" name="derbynet"
rev="10.10.1.1" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.postgresql" name="postgresql"
rev="9.3-1100-jdbc4" conf="openmeetings->*" transitive="false">
+ <dependency org="org.postgresql" name="postgresql"
rev="9.3-1101-jdbc4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="dom4j" name="dom4j" rev="1.6.1"
conf="openmeetings->*" transitive="false">
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1571003&r1=1571002&r2=1571003&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
Sun Feb 23 12:27:32 2014
@@ -94,7 +94,7 @@ public class FlvRecordingMetaData implem
private Boolean isVideoOnly;
@Column(name = "is_screen_data")
- @Element(data = true)
+ @Element(data = true, name = "isScreenData")
private boolean screenData;
@Column(name = "inserted_by")
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1571003&r1=1571002&r2=1571003&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Sun Feb 23 12:27:32 2014
@@ -176,7 +176,7 @@
<dependency org="org.apache.derby" name="derbynet"
rev="10.10.1.1" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.postgresql" name="postgresql"
rev="9.3-1100-jdbc4" conf="openmeetings->*" transitive="false">
+ <dependency org="org.postgresql" name="postgresql"
rev="9.3-1101-jdbc4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="dom4j" name="dom4j" rev="1.6.1"
conf="openmeetings->*" transitive="false">
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1571003&r1=1571002&r2=1571003&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
Sun Feb 23 12:27:32 2014
@@ -94,7 +94,7 @@ public class FlvRecordingMetaData implem
private Boolean isVideoOnly;
@Column(name = "is_screen_data")
- @Element(data = true)
+ @Element(data = true, name = "isScreenData")
private boolean screenData;
@Column(name = "inserted_by")
