Author: solomax
Date: Wed Dec 16 10:08:19 2015
New Revision: 1720313
URL: http://svn.apache.org/viewvc?rev=1720313&view=rev
Log:
Code clean-up, minor build fix
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/trunk/openmeetings-web/pom.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
Wed Dec 16 10:08:19 2015
@@ -35,48 +35,61 @@ public class RoomOptionsDTO implements S
private boolean showNickNameDialog;
private boolean allowSameURLMultipleTimes;
private boolean allowRecording;
-
+
public RoomOptionsDTO() {}
-
+
public Long getRoomId() {
return roomId;
}
+
public void setRoomId(Long roomId) {
this.roomId = roomId;
}
+
public Long getRecordingId() {
return recordingId;
}
+
public void setRecordingId(Long recordingId) {
this.recordingId = recordingId;
}
+
public boolean isModerator() {
return moderator;
}
+
public void setModerator(boolean moderator) {
this.moderator = moderator;
}
+
public boolean isShowAudioVideoTest() {
return showAudioVideoTest;
}
+
public void setShowAudioVideoTest(boolean showAudioVideoTest) {
this.showAudioVideoTest = showAudioVideoTest;
}
+
public boolean isShowNickNameDialog() {
return showNickNameDialog;
}
+
public void setShowNickNameDialog(boolean showNickNameDialog) {
this.showNickNameDialog = showNickNameDialog;
}
+
public boolean isAllowSameURLMultipleTimes() {
return allowSameURLMultipleTimes;
}
+
public void setAllowSameURLMultipleTimes(boolean
allowSameURLMultipleTimes) {
this.allowSameURLMultipleTimes = allowSameURLMultipleTimes;
}
+
public boolean isAllowRecording() {
return allowRecording;
}
+
public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
Wed Dec 16 10:08:19 2015
@@ -35,48 +35,61 @@ public class ExternalUserDTO implements
private String email;
private String externalId;
private String externalType;
-
+
public ExternalUserDTO() {}
-
+
public String getLogin() {
return login;
}
+
public void setLogin(String login) {
this.login = login;
}
+
public String getFirstname() {
return firstname;
}
+
public void setFirstname(String firstname) {
this.firstname = firstname;
}
+
public String getLastname() {
return lastname;
}
+
public void setLastname(String lastname) {
this.lastname = lastname;
}
+
public String getProfilePictureUrl() {
return profilePictureUrl;
}
+
public void setProfilePictureUrl(String profilePictureUrl) {
this.profilePictureUrl = profilePictureUrl;
}
+
public String getEmail() {
return email;
}
+
public void setEmail(String email) {
this.email = email;
}
+
public String getExternalId() {
return externalId;
}
+
public void setExternalId(String externalId) {
this.externalId = externalId;
}
+
public String getExternalType() {
return externalType;
}
+
public void setExternalType(String externalType) {
this.externalType = externalType;
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Wed Dec 16
10:08:19 2015
@@ -389,6 +389,20 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution><!-- FIXME should be
refactored -->
+ <id>select-db</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
+
tofile="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml"
+
overwrite="true" force="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution><!-- FIXME should be
refactored -->
<id>move-openjpa-resources</id>
<phase>process-resources</phase>
<configuration>
@@ -396,12 +410,6 @@
<copy
todir="${project.build.directory}/test-root">
<fileset dir="${project.basedir}/src/main/webapp"/>
</copy>
- <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
-
tofile="${project.build.directory}/${project.build.finalName}/WEB-INF/classes/META-INF/persistence.xml"
-
overwrite="true"/>
- <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
-
tofile="${project.build.directory}/test-classes/META-INF/persistence.xml"
-
overwrite="true"/>
</target>
</configuration>
<goals>
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java
Wed Dec 16 10:08:19 2015
@@ -35,48 +35,61 @@ public class RoomOptionsDTO implements S
private boolean showNickNameDialog;
private boolean allowSameURLMultipleTimes;
private boolean allowRecording;
-
+
public RoomOptionsDTO() {}
-
+
public Long getRoomId() {
return roomId;
}
+
public void setRoomId(Long roomId) {
this.roomId = roomId;
}
+
public Long getRecordingId() {
return recordingId;
}
+
public void setRecordingId(Long recordingId) {
this.recordingId = recordingId;
}
+
public boolean isModerator() {
return moderator;
}
+
public void setModerator(boolean moderator) {
this.moderator = moderator;
}
+
public boolean isShowAudioVideoTest() {
return showAudioVideoTest;
}
+
public void setShowAudioVideoTest(boolean showAudioVideoTest) {
this.showAudioVideoTest = showAudioVideoTest;
}
+
public boolean isShowNickNameDialog() {
return showNickNameDialog;
}
+
public void setShowNickNameDialog(boolean showNickNameDialog) {
this.showNickNameDialog = showNickNameDialog;
}
+
public boolean isAllowSameURLMultipleTimes() {
return allowSameURLMultipleTimes;
}
+
public void setAllowSameURLMultipleTimes(boolean
allowSameURLMultipleTimes) {
this.allowSameURLMultipleTimes = allowSameURLMultipleTimes;
}
+
public boolean isAllowRecording() {
return allowRecording;
}
+
public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java
Wed Dec 16 10:08:19 2015
@@ -35,48 +35,61 @@ public class ExternalUserDTO implements
private String email;
private String externalId;
private String externalType;
-
+
public ExternalUserDTO() {}
-
+
public String getLogin() {
return login;
}
+
public void setLogin(String login) {
this.login = login;
}
+
public String getFirstname() {
return firstname;
}
+
public void setFirstname(String firstname) {
this.firstname = firstname;
}
+
public String getLastname() {
return lastname;
}
+
public void setLastname(String lastname) {
this.lastname = lastname;
}
+
public String getProfilePictureUrl() {
return profilePictureUrl;
}
+
public void setProfilePictureUrl(String profilePictureUrl) {
this.profilePictureUrl = profilePictureUrl;
}
+
public String getEmail() {
return email;
}
+
public void setEmail(String email) {
this.email = email;
}
+
public String getExternalId() {
return externalId;
}
+
public void setExternalId(String externalId) {
this.externalId = externalId;
}
+
public String getExternalType() {
return externalType;
}
+
public void setExternalType(String externalType) {
this.externalType = externalType;
}
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Wed Dec 16 10:08:19 2015
@@ -259,7 +259,8 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg
[ANNOUNCE] Apache OpenMeetings x.xx
released
</p>
<p>
- Update release section of DOAP file
<tt>openmeetings-server/src/site/xdoc/doap.rdf</tt>
+ Update release section of DOAP file
<tt>openmeetings-server/src/site/xdoc/doap.rdf</tt> and copy it to the OM site
<tt></tt>
+
</p>
<p>
Add a section to <a
href="downloads.html">downloads</a> website.<br />
Modified: openmeetings/application/trunk/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/pom.xml?rev=1720313&r1=1720312&r2=1720313&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/pom.xml Wed Dec 16 10:08:19
2015
@@ -389,6 +389,20 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution><!-- FIXME should be
refactored -->
+ <id>select-db</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
+
tofile="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml"
+
overwrite="true" force="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution><!-- FIXME should be
refactored -->
<id>move-openjpa-resources</id>
<phase>process-resources</phase>
<configuration>
@@ -396,12 +410,6 @@
<copy
todir="${project.build.directory}/test-root">
<fileset dir="${project.basedir}/src/main/webapp"/>
</copy>
- <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
-
tofile="${project.build.directory}/${project.build.finalName}/WEB-INF/classes/META-INF/persistence.xml"
-
overwrite="true"/>
- <copy
file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
-
tofile="${project.build.directory}/test-classes/META-INF/persistence.xml"
-
overwrite="true"/>
</target>
</configuration>
<goals>
